diff options
| -rw-r--r-- | src/main/java/net/minecraft/server/World.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 419149ed..4a42bb45 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -976,10 +976,12 @@ public abstract class World implements IBlockAccess { // CraftBukkit start - Decrement loop variable field if we've already ticked this entity int index = this.entityList.indexOf(entity); - if (index <= this.tickPosition) { - this.tickPosition--; + if (index != -1) { + if (index <= this.tickPosition) { + this.tickPosition--; + } + this.entityList.remove(index); } - this.entityList.remove(index); // CraftBukkit end this.b(entity); |