diff options
| author | Erik Broes <erikbroes@grum.nl> | 2012-01-12 23:10:13 +0100 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2012-01-12 23:10:13 +0100 |
| commit | 7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee (patch) | |
| tree | a1ca024b03aadf4b687f442b33bf713aecd511f7 /src/main/java/net/minecraft/server/WorldServer.java | |
| parent | dd5ef8725c699e0b2946dc0f6d523ca482404043 (diff) | |
| download | craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.gz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.lz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.xz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.zip | |
Updated to Minecraft 1.1
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldServer.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/WorldServer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index adde7394..863631c7 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -102,6 +102,9 @@ public class WorldServer extends World implements BlockChangeDelegate { entity.die(); } // CraftBukkit end */ + if (!this.server.spawnNPCs && entity instanceof NPC) { + entity.die(); + } if (entity.passenger == null || !(entity.passenger instanceof EntityHuman)) { super.entityJoinedWorld(entity, flag); @@ -171,7 +174,7 @@ public class WorldServer extends World implements BlockChangeDelegate { protected void c(Entity entity) { super.c(entity); this.N.a(entity.id, entity); - Entity[] aentity = entity.aG(); + Entity[] aentity = entity.aR(); if (aentity != null) { for (int i = 0; i < aentity.length; ++i) { @@ -183,7 +186,7 @@ public class WorldServer extends World implements BlockChangeDelegate { protected void d(Entity entity) { super.d(entity); this.N.d(entity.id); - Entity[] aentity = entity.aG(); + Entity[] aentity = entity.aR(); if (aentity != null) { for (int i = 0; i < aentity.length; ++i) { |