From 3e076d39512aab23a850e8a7bb0860ab68b99a73 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 31 Dec 2010 09:53:03 -0800
Subject: [PATCH] Added a null check for attacker in onDamage

---
 vMinecraftCommands.java | 1 -
 vMinecraftListener.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vMinecraftCommands.java b/vMinecraftCommands.java
index 234463642..ea7bf0b3a 100644
--- a/vMinecraftCommands.java
+++ b/vMinecraftCommands.java
@@ -48,7 +48,6 @@ public class vMinecraftCommands{
         cl.register("/whois", "whois", "/whois [user]");
         cl.register("/say", "say");
         cl.register("/a", "adminChatToggle", "Toggle admin chat for every message");
-        //cl.register("/modify", "modify");
         cl.register("/rules", "rules", "Displays the rules");
         cl.register("/who", "who");
         cl.register("/promote", "promote", "Promote a player one rank");
diff --git a/vMinecraftListener.java b/vMinecraftListener.java
index c7027f70f..254cf33f5 100644
--- a/vMinecraftListener.java
+++ b/vMinecraftListener.java
@@ -167,7 +167,7 @@ public class vMinecraftListener extends PluginListener {
             if(vMinecraftSettings.getInstance().isEzModo(dplayer.getName())){
                 return true;
             }
-            if(attacker.isPlayer()){
+            if(attacker != null && attacker.isPlayer()){
                 Player aplayer = attacker.getPlayer();
                 if(vMinecraftUsers.getProfile(dplayer).inParty()){
                     if(vMinecraftParty.inSameParty(aplayer, dplayer)){