From 306e56980c1708f970e761288e6288b5027936f0 Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Tue, 23 Feb 2016 14:44:07 +0000 Subject: [PATCH] remove weapon teleport fix --- .../src/mineplex/game/clans/clans/siege/weapon/Cannon.java | 4 ++-- .../mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java index 27ba0087b..67beb670a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java @@ -251,7 +251,7 @@ public class Cannon extends SiegeWeapon private void loadEntities() { - Slime filler = _location.getWorld().spawn(_location, Slime.class); + Slime filler = _location.getWorld().spawn(_location.clone().add(.5, 0, .5), Slime.class); UtilEnt.silence(filler, true); UtilEnt.Vegetate(filler); @@ -261,7 +261,7 @@ public class Cannon extends SiegeWeapon addEntity(filler, "Filler_1"); - Slime playerMount = _location.getWorld().spawn(_location, Slime.class); + Slime playerMount = _location.getWorld().spawn(_location.clone().add(.5, 0, .5), Slime.class); UtilEnt.silence(playerMount, true); UtilEnt.Vegetate(playerMount); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java index d7db58e5e..a324c5114 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java @@ -294,12 +294,6 @@ public abstract class SiegeWeapon implements Listener return; } - if (UtilMath.getDecimalPoints(getEntity("WEAPON").getLocation().getX()) != .5) - { - ResetEntities(); - return; - } - if (_inventory != null) { checkInventory();