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

HG STUFF

This commit is contained in:
Chiss 2013-11-23 09:28:27 +11:00
parent a5a80378f7
commit 42cab3a39c
2 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java
View File

@ -1131,17 +1131,4 @@ public class HungerGames extends SoloGame
{ {
event.SetDamageToLevel(false); event.SetDamageToLevel(false);
} }
@EventHandler
public void Firework(UpdateEvent event)
{
if (!IsLive())
return;
if (event.getType() != UpdateType.SEC)
return;
FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(Color.YELLOW).with(Type.BALL).trail(false).build();
UtilFirework.playFirework(GetSpectatorLocation(), effect);
}
} }

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

@ -34,6 +34,7 @@ public class PerkSkeletons extends Perk
private HashMap<Player, ArrayList<Skeleton>> _minions = new HashMap<Player, ArrayList<Skeleton>>(); private HashMap<Player, ArrayList<Skeleton>> _minions = new HashMap<Player, ArrayList<Skeleton>>();
private boolean _name; private boolean _name;
private int _maxDist = 8;
public PerkSkeletons(boolean name) public PerkSkeletons(boolean name)
{ {
@ -112,6 +113,20 @@ public class PerkSkeletons extends Perk
if (_minions.get(event.getTarget()).contains(event.getEntity())) if (_minions.get(event.getTarget()).contains(event.getEntity()))
event.setCancelled(true); event.setCancelled(true);
for (Player player : _minions.keySet())
{
for (Skeleton skel : _minions.get(player))
{
if (event.getEntity().equals(skel))
{
if (UtilMath.offset(skel, player) > _maxDist)
{
}
}
}
}
} }
@EventHandler @EventHandler
@ -137,19 +152,11 @@ public class PerkSkeletons extends Perk
//Return to Owner //Return to Owner
double range = 4; double range = 4;
if (skel.getTarget() != null) if (skel.getTarget() != null || ((CraftSkeleton)skel).getHandle().getGoalTarget() != null)
{ {
range = 8; range = _maxDist;
System.out.println("A: " + UtilEnt.getName(skel.getTarget()));
} }
if (((CraftSkeleton)skel).getHandle().getGoalTarget() != null)
{
range = 8;
System.out.println("B: " + ((CraftSkeleton)skel).getHandle().getGoalTarget());
}
if (UtilMath.offset(skel, player) > range) if (UtilMath.offset(skel, player) > range)
{ {
float speed = 1f; float speed = 1f;
@ -157,15 +164,14 @@ public class PerkSkeletons extends Perk
speed = 1.4f; speed = 1.4f;
//Move //Move
Location target = skel.getLocation().add(UtilAlg.getTrajectory(skel, player).multiply(3));
EntityCreature ec = ((CraftCreature)skel).getHandle(); EntityCreature ec = ((CraftCreature)skel).getHandle();
Navigation nav = ec.getNavigation(); Navigation nav = ec.getNavigation();
Location target = player.getLocation().add(UtilAlg.getTrajectory(player, skel));
nav.a(target.getX(), target.getY(), target.getZ(), speed); nav.a(target.getX(), target.getY(), target.getZ(), speed);
skel.setTarget(null); skel.setTarget(null);
((CraftSkeleton)skel).getHandle().setGoalTarget(null); ((CraftSkeleton)skel).getHandle().setGoalTarget(null);
System.out.println("OUT OF RANGE! RETURN HOME MY FRIEND");
} }
} }
} }