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 495226231..4bef46f97 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 @@ -20,15 +20,12 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity; -import org.bukkit.entity.Creature; -import org.bukkit.entity.Entity; +import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity;import org.bukkit.entity.Creature;import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Giant; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.entity.Skeleton; - -import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCreature; +import org.bukkit.entity.Skeleton;import org.bukkit.craftbukkit.v1_6_R3.entity.CraftCreature; import org.bukkit.craftbukkit.v1_6_R3.CraftWorld; public class UtilEnt @@ -46,6 +43,14 @@ public class UtilEnt return _nameMap; } + public static void ghost(Entity entity, boolean ghost) + { + if (entity instanceof LivingEntity) + { + ((CraftLivingEntity)entity).getHandle().ghost = ghost; + } + } + public static void Vegetate(Entity entity) { try diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java index 0e06e689d..13d2d6a87 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java @@ -37,7 +37,7 @@ public class Halloween2013_BatGun extends ItemGadget private HashMap _velocity = new HashMap(); private HashMap> _bats = new HashMap>(); - public Halloween2013_BatGun(GadgetManager manager) + public Halloween2013_BatGun(GadgetManager manager) { super(manager, "Bat Blaster", new String[] { diff --git a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/Entity.java b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/Entity.java index 4222fd09a..59deae79f 100644 --- a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/Entity.java +++ b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/Entity.java @@ -42,6 +42,7 @@ import net.minecraft.server.v1_6_R3.Vec3D; import net.minecraft.server.v1_6_R3.World; import net.minecraft.server.v1_6_R3.WorldServer; + // CraftBukkit start import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java index 943783cac..f9a3296d2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java @@ -39,7 +39,7 @@ public class GameFactory { private ArcadeManager _manager; - public GameFactory(ArcadeManager gameManager) + public GameFactory(ArcadeManager gameManager) { _manager = gameManager; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java index f8da51117..a52108506 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java @@ -126,6 +126,7 @@ public abstract class Kit implements Listener } UtilEnt.Vegetate(entity); + UtilEnt.ghost(entity, true); SpawnCustom(entity);