浏览代码

Bug Fix: Players not in a party would cause a null pointer exception during a pvp kill.

nossr50 14 年之前
父节点
当前提交
6feb824940
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      mcMMO/com/bukkit/nossr50/mcMMO/mcEntityListener.java

+ 2 - 2
mcMMO/com/bukkit/nossr50/mcMMO/mcEntityListener.java

@@ -25,9 +25,9 @@ public class mcEntityListener extends EntityListener {
     		//If defender is player
     		if(x instanceof Player){
     			Player defender = (Player)x;
-    			if(mcUsers.getProfile(defender).getParty().equals(mcUsers.getProfile(attacker).getParty())){
+    			if(mcUsers.getProfile(defender).inParty() && mcUsers.getProfile(defender).getParty().equals(mcUsers.getProfile(attacker).getParty()))
     				event.setCancelled(true);
-    			}
+
     			if(mcUsers.getProfile(defender).isDead())
     				return;
     			if((defender.getHealth() - event.getDamage()) <= 0){