Check if entity is in list before decrementing. Fixes BUKKIT-5404

This commit is contained in:
EvilSeph 2014-02-11 14:55:21 -05:00
parent 00b3721f07
commit d9e04a5b24

View file

@ -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);