SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Class Cast Exception Fixed

Browse Source
This commit is contained in:
Driftay 2020-04-06 15:28:49 -04:00
parent 388f83694d
commit 8efe68111b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -342,20 +342,22 @@ public class FactionsEntityListener implements Listener {
if (!(damagee instanceof Player)) return true; if (!(damagee instanceof Player)) return true;
FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee); FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee);
if(damager instanceof Player) {
FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager);
if (defender == null || defender.getPlayer() == null) return true; if (defender == null || defender.getPlayer() == null) return true;
if (attacker.getFaction() == defender.getFaction()) { if (attacker.getFaction() == defender.getFaction()) {
if (attacker.hasFriendlyFire() && defender.hasFriendlyFire()) return true; if (attacker.hasFriendlyFire() && defender.hasFriendlyFire()) return true;
if (attacker.hasFriendlyFire() && !defender.hasFriendlyFire()) { if (attacker.hasFriendlyFire() && !defender.hasFriendlyFire()) {
attacker.msg(TL.FRIENDLY_FIRE_OFF_ATTACKER, defender.getName()); attacker.msg(TL.FRIENDLY_FIRE_OFF_ATTACKER, defender.getName());
return false; return false;
} else if(!attacker.hasFriendlyFire() && defender.hasFriendlyFire()){ } else if (!attacker.hasFriendlyFire() && defender.hasFriendlyFire()) {
attacker.msg(TL.FRIENDLY_FIRE_YOU_MUST); attacker.msg(TL.FRIENDLY_FIRE_YOU_MUST);
return false; return false;
} }
} }
}
Location defenderLoc = defender.getPlayer().getLocation(); Location defenderLoc = defender.getPlayer().getLocation();