JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Manager.canHurt instead of team equality

Browse Source
This commit is contained in:
Spencer 2017-12-28 18:38:58 -05:00 committed by Alexander Meech
parent 496d515972
commit f41e9a4e2c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSkeletons.java
View File

@ -169,11 +169,7 @@ public class PerkSkeletons extends Perk
event.setCancelled(true); event.setCancelled(true);
} }
if (event.getTarget() instanceof Player) if (!Manager.canHurt(player, (Player) event.getTarget()))
{
Player target = (Player) event.getTarget();
if (Manager.GetGame().GetTeam(player) == Manager.GetGame().GetTeam(target))
{ {
event.setCancelled(true); event.setCancelled(true);
} }
@ -181,7 +177,6 @@ public class PerkSkeletons extends Perk
} }
} }
} }
}
@EventHandler @EventHandler
public void MinionUpdate(UpdateEvent event) public void MinionUpdate(UpdateEvent event)