From cb2afb5a4f83e751637ffc92ac50e76564dff5aa Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 6 Apr 2020 15:34:26 -0400 Subject: [PATCH] Anotha one --- .../factions/listeners/FactionsEntityListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index dac9ff3e..2a0ff3f1 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -344,7 +344,7 @@ public class FactionsEntityListener implements Listener { FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee); - if(damager instanceof Player) { + if (damager instanceof Player) { FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); if (defender == null || defender.getPlayer() == null) return true; if (attacker.getFaction() == defender.getFaction()) { @@ -377,6 +377,7 @@ public class FactionsEntityListener implements Listener { if (defLocFaction.noPvPInTerritory()) { if (damager instanceof Player) { if (notify) { + FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); attacker.msg(TL.PLAYER_CANTHURT, (defLocFaction.isSafeZone() ? TL.REGION_SAFEZONE.toString() : TL.REGION_PEACEFUL.toString())); } return false; @@ -386,7 +387,7 @@ public class FactionsEntityListener implements Listener { if (!(damager instanceof Player)) return true; - attacker = FPlayers.getInstance().getByPlayer((Player) damager); + FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); if (attacker == null || attacker.getPlayer() == null) return true;