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

Finish TargetCancel inside PerkSkeleton 

Should prevent skeletons from attacking teammates
This commit is contained in:
Spencer 2017-12-18 14:27:48 -05:00 committed by Alexander Meech
parent fa72dc60dd
commit 131369cebe
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,9 +160,21 @@ public class PerkSkeletons extends Perk
{ {
if (event.getEntity().equals(skel)) if (event.getEntity().equals(skel))
{ {
// Cancel targeting when the skeleton
// needs to return home
if (UtilMath.offset(skel, player) > _maxDist) if (UtilMath.offset(skel, player) > _maxDist)
{ {
event.setCancelled(true);
}
if (event.getTarget() instanceof Player)
{
Player target = (Player) event.getTarget();
if (Manager.GetGame().GetTeam(player) == Manager.GetGame().GetTeam(target))
{
event.setCancelled(true);
}
} }
} }
} }
@ -190,13 +202,15 @@ public class PerkSkeletons extends Perk
continue; continue;
} }
//Return to Owner
double range = 4; double range = 4;
//If it's targeting another player
if (skel.getTarget() != null || ((CraftSkeleton) skel).getHandle().getGoalTarget() != null) if (skel.getTarget() != null || ((CraftSkeleton) skel).getHandle().getGoalTarget() != null)
{ {
range = _maxDist; range = _maxDist;
} }
//Return to Owner
if (UtilMath.offset(skel, player) > range) if (UtilMath.offset(skel, player) > range)
{ {
float speed = 1.25f; float speed = 1.25f;