From 7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Tue, 6 Nov 2012 06:05:28 -0600 Subject: Update CraftBukkit to Minecraft 1.4.4. --- .../java/net/minecraft/server/TileEntityMobSpawner.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft/server/TileEntityMobSpawner.java') diff --git a/src/main/java/net/minecraft/server/TileEntityMobSpawner.java b/src/main/java/net/minecraft/server/TileEntityMobSpawner.java index 0f3b7b03..ccc94d22 100644 --- a/src/main/java/net/minecraft/server/TileEntityMobSpawner.java +++ b/src/main/java/net/minecraft/server/TileEntityMobSpawner.java @@ -79,7 +79,7 @@ public class TileEntityMobSpawner extends TileEntity { this.world.addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit this.world.triggerEffect(2004, this.x, this.y, this.z, 0); if (entityliving != null) { - entityliving.aQ(); + entityliving.aR(); } this.e(); @@ -107,12 +107,17 @@ public class TileEntityMobSpawner extends TileEntity { entity.e(nbttagcompound); } else if (entity instanceof EntityLiving && entity.world != null) { - ((EntityLiving) entity).bD(); + ((EntityLiving) entity).bG(); } } private void e() { - this.spawnDelay = this.minSpawnDelay + this.world.random.nextInt(this.maxSpawnDelay - this.minSpawnDelay); + if (this.maxSpawnDelay <= this.minSpawnDelay) { + this.spawnDelay = this.minSpawnDelay; + } else { + this.spawnDelay = this.minSpawnDelay + this.world.random.nextInt(this.maxSpawnDelay - this.minSpawnDelay); + } + this.world.playNote(this.x, this.y, this.z, this.q().id, 1, 0); } @@ -157,7 +162,7 @@ public class TileEntityMobSpawner extends TileEntity { } } - public Packet l() { + public Packet getUpdatePacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); this.b(nbttagcompound); -- cgit v1.2.3