From 8efe68111b9ee01117523dc4078cf4dc8f9b9979 Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 6 Apr 2020 15:28:49 -0400 Subject: [PATCH] Class Cast Exception Fixed --- .../listeners/FactionsEntityListener.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index e2502155..dac9ff3e 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -342,18 +342,20 @@ public class FactionsEntityListener implements Listener { if (!(damagee instanceof Player)) return true; FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee); - FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); - if (defender == null || defender.getPlayer() == null) return true; - if (attacker.getFaction() == defender.getFaction()) { - if (attacker.hasFriendlyFire() && defender.hasFriendlyFire()) return true; - if (attacker.hasFriendlyFire() && !defender.hasFriendlyFire()) { - attacker.msg(TL.FRIENDLY_FIRE_OFF_ATTACKER, defender.getName()); - return false; - } else if(!attacker.hasFriendlyFire() && defender.hasFriendlyFire()){ - attacker.msg(TL.FRIENDLY_FIRE_YOU_MUST); - return false; + if(damager instanceof Player) { + FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); + if (defender == null || defender.getPlayer() == null) return true; + if (attacker.getFaction() == defender.getFaction()) { + if (attacker.hasFriendlyFire() && defender.hasFriendlyFire()) return true; + if (attacker.hasFriendlyFire() && !defender.hasFriendlyFire()) { + attacker.msg(TL.FRIENDLY_FIRE_OFF_ATTACKER, defender.getName()); + return false; + } else if (!attacker.hasFriendlyFire() && defender.hasFriendlyFire()) { + attacker.msg(TL.FRIENDLY_FIRE_YOU_MUST); + return false; + } } }