|
@@ -75,11 +75,19 @@ public class EntityListener implements Listener {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if (attacker instanceof Player && defender instanceof Player) {
|
|
|
|
- if (PartyManager.getInstance().inSameParty((Player) defender, (Player) attacker)) {
|
|
|
|
- event.setCancelled(true);
|
|
|
|
|
|
+ if (defender instanceof Player) {
|
|
|
|
+ Player defendingPlayer = (Player) defender;
|
|
|
|
+
|
|
|
|
+ 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 */
|