diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index 7db14b9c2..d69c6c2a3 100644 Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ 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 ae57d6de7..d042765f7 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 @@ -55,6 +55,7 @@ public class UtilEnt } ((CraftEntity)entity).getHandle().Invisible = invisible; + ((CraftEntity)entity).getHandle().setInvisible(invisible); } public static void Leash(LivingEntity leashed, Entity holder, boolean pull, boolean breakable) @@ -71,6 +72,11 @@ public class UtilEnt } public static void Vegetate(Entity entity) + { + Vegetate(entity, false); + } + + public static void Vegetate(Entity entity, boolean mute) { try { @@ -104,6 +110,7 @@ public class UtilEnt EntityInsentient creature = (EntityInsentient)((CraftEntity)entity).getHandle(); creature.Vegetated = true; + creature.Silent = mute; PathfinderGoalSelector goalSelector = new PathfinderGoalSelector(((CraftWorld)entity.getWorld()).getHandle().methodProfiler); goalSelector.a(7, new PathfinderGoalLookAtPlayer(creature, EntityHuman.class, 6.0F)); 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 8c0afc559..aec526eda 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 @@ -149,6 +149,7 @@ public abstract class Entity { public boolean valid; // CraftBukkit public boolean Invisible; + public boolean Silent; public Entity(World world) { this.id = entityCount++; @@ -708,7 +709,9 @@ public abstract class Entity { this.makeSound("liquid.swim", f, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F); } - this.a(l, k, i1, j1); + if (!Silent) + a(l, k, i1, j1); + Block.byId[j1].b(this.world, l, k, i1, this); } } diff --git a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityInsentient.java b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityInsentient.java index b99e3b4b5..7b2e30a52 100644 --- a/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityInsentient.java +++ b/Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_6_R3/EntityInsentient.java @@ -148,7 +148,7 @@ public abstract class EntityInsentient extends EntityLiving { public void y() { super.y(); this.world.methodProfiler.a("mobBaseTick"); - if (this.isAlive() && this.random.nextInt(1000) < this.a_++) { + if (this.isAlive() && !Silent && this.random.nextInt(1000) < this.a_++) { this.a_ = -this.o(); this.p(); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java index 9d44aaecd..6a450e593 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java @@ -52,7 +52,7 @@ public class Sleigh Target = loc.clone(); CentralEntity = loc.getWorld().spawn(loc, Chicken.class); - UtilEnt.Vegetate(CentralEntity); + UtilEnt.Vegetate(CentralEntity, true); UtilEnt.ghost(CentralEntity, true, true); //Presents @@ -142,11 +142,6 @@ public class Sleigh for (SleighHorse horse : SleighHorses) UtilEnt.Leash(horse.Ent, santa.GetTop(), false, false); - - for (SleighPart part : SleighEnts) - { - ((CraftEntity)part.Ent).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 32)); - } } public Location GetLocation() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/SleighPart.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/SleighPart.java index ead0d609a..7d39d70e1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/SleighPart.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/SleighPart.java @@ -37,7 +37,7 @@ public class SleighPart Ent = loc.getWorld().spawn(loc.add(x, 0, z), Chicken.class); Ent.setBaby(); Ent.setAgeLock(true); - UtilEnt.Vegetate(Ent); + UtilEnt.Vegetate(Ent, true); UtilEnt.ghost(Ent, true, true); //Height @@ -47,7 +47,7 @@ public class SleighPart Chicken newTop = loc.getWorld().spawn(loc.add(x, 0, z), Chicken.class); newTop.setBaby(); newTop.setAgeLock(true); - UtilEnt.Vegetate(newTop); + UtilEnt.Vegetate(newTop, true); UtilEnt.ghost(newTop, true, true); top.setPassenger(newTop);