From 54f2cb346721f7e357c1442a3ca70b019c9c3f9d Mon Sep 17 00:00:00 2001 From: Chiss Date: Wed, 18 Dec 2013 19:58:39 +1100 Subject: [PATCH] Christmas hub snowman target cancel --- .../src/mineplex/core/common/util/UtilEnt.java | 8 +++++--- .../src/mineplex/hub/modules/WorldManager.java | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java index b07fba8bf..292f61cdf 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java @@ -516,18 +516,20 @@ public class UtilEnt } } - public static void CreatureMoveFast(Entity ent, Location target, float speed) + public static boolean CreatureMoveFast(Entity ent, Location target, float speed) { if (!(ent instanceof Creature)) - return; + return false; if (UtilMath.offset(ent.getLocation(), target) < 0.1) - return; + return false; if (UtilMath.offset(ent.getLocation(), target) < 2) speed = Math.min(speed, 1f); EntityCreature ec = ((CraftCreature)ent).getHandle(); ec.getControllerMove().a(target.getX(), target.getY(), target.getZ(), speed); + + return true; } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java index a07d34958..6ed66f667 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java @@ -37,6 +37,7 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.event.block.LeavesDecayEvent; import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerPickupItemEvent; @@ -272,4 +273,13 @@ public class WorldManager extends MiniPlugin { event.setCancelled(true); } + + @EventHandler + public void CreatureTarget(EntityTargetEvent event) + { + if (Manager.Mode.equals("Christmas")) + { + event.setCancelled(true); + } + } }