EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-31 01:03:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nossr50
2011-02-04 20:58:21 -08:00
parent 18bc3fec4a
commit 6feb824940
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcMMO/com/bukkit/nossr50/mcMMO/mcEntityListener.java
View File

@@ -25,9 +25,9 @@ public class mcEntityListener extends EntityListener {
//If defender is player //If defender is player
if(x instanceof Player){ if(x instanceof Player){
Player defender = (Player)x; 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); event.setCancelled(true);
}
if(mcUsers.getProfile(defender).isDead()) if(mcUsers.getProfile(defender).isDead())
return; return;
if((defender.getHealth() - event.getDamage()) <= 0){ if((defender.getHealth() - event.getDamage()) <= 0){