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

Fixed Citizens error with new upgrades

Browse Source
This commit is contained in:
Driftay 2019-09-24 17:42:10 -04:00
parent f358e6d75b
commit 2a08f167bb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/massivecraft/factions/zcore/fupgrades/UpgradesListener.java
View File

@ -156,12 +156,17 @@ public class UpgradesListener implements Listener {
if (!(e.getDamager() instanceof Player) || !(e.getEntity() instanceof Player)) { if (!(e.getDamager() instanceof Player) || !(e.getEntity() instanceof Player)) {
return; return;
} }
if(e.getDamager().hasMetadata("NPC") || e.getEntity().hasMetadata("NPC")) return;
FPlayer fme = FPlayers.getInstance().getByPlayer((Player) e.getEntity()); FPlayer fme = FPlayers.getInstance().getByPlayer((Player) e.getEntity());
FPlayer dame = FPlayers.getInstance().getByPlayer((Player) e.getDamager()); FPlayer dame = FPlayers.getInstance().getByPlayer((Player) e.getDamager());
if (fme == null || dame == null) { if (fme == null || dame == null) {
return; return;
} }
FLocation floc = new FLocation(fme.getPlayer().getLocation());
FLocation floc = new FLocation((Player) fme.getPlayer().getLocation());
if (Board.getInstance().getFactionAt(floc) == fme.getFaction()) { if (Board.getInstance().getFactionAt(floc) == fme.getFaction()) {
if (dame.getFaction() == fme.getFaction()) { if (dame.getFaction() == fme.getFaction()) {
return; return;