From d3ec976f44305e36d59ff14ae38adaf1c0c31856 Mon Sep 17 00:00:00 2001 From: bm01 Date: Sun, 3 Mar 2013 13:43:56 +0100 Subject: [PATCH] I'd say no But if the player can actually be off-line, be sure to add a comment explaining why. --- .../nossr50/listeners/EntityListener.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 5d486368e..1e3b460c8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -103,26 +103,19 @@ public class EntityListener implements Listener { } } - if (defender instanceof Player) { + if (defender instanceof Player && attacker instanceof Player) { Player defendingPlayer = (Player) defender; + Player attackingPlayer = (Player) attacker; - // TODO: Is this even possible? - if (!defendingPlayer.isOnline()) { + // TODO: Why? + if (defendingPlayer == attackingPlayer) { return; } - - if (attacker instanceof Player) { - Player attackingPlayer = (Player) attacker; - - if (defendingPlayer == attackingPlayer) { + else if (PartyManager.inSameParty(defendingPlayer, attackingPlayer)) { + if (!(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) { + event.setCancelled(true); return; } - else if (PartyManager.inSameParty(defendingPlayer, attackingPlayer)) { - if (!(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) { - event.setCancelled(true); - return; - } - } } } @@ -163,8 +156,7 @@ public class EntityListener implements Listener { if (livingEntity instanceof Player) { Player player = (Player) entity; - // TODO: Is it even possible for the player to be off-line here? - if (!player.isOnline() || Misc.isNPCEntity(player)) { + if (Misc.isNPCEntity(player)) { return; }