EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-16 17:13:38 +02:00
Code Issues Projects Releases Wiki Activity

Fix issue with EntityDamageByEntityEvents & Offline Players

Browse Source
This commit is contained in:
GJ 2012-06-28 08:14:14 -04:00
parent 0c1a8eff85
commit 565ef693ce
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -75,11 +75,19 @@ public class EntityListener implements Listener {
} }
} }
if (attacker instanceof Player && defender instanceof Player) { if (defender instanceof Player) {
if (PartyManager.getInstance().inSameParty((Player) defender, (Player) attacker)) { Player defendingPlayer = (Player) defender;
event.setCancelled(true);
if (!defendingPlayer.isOnline()) {
return; return;
} }
if (attacker instanceof Player) {
if (PartyManager.getInstance().inSameParty(defendingPlayer, (Player) attacker)) {
event.setCancelled(true);
return;
}
}
} }
/* Check for invincibility */ /* Check for invincibility */