From 29b1e53fa40fbf82cb6f7eba59b0061dda85fd48 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked in a vehicle diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 9c2ae28..0f4b93e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1046,6 +1046,7 @@ public abstract class World implements IBlockAccess { this.everyoneSleeping(); } + if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking int i = entity.ae; int j = entity.ag; @@ -1062,6 +1063,7 @@ public abstract class World implements IBlockAccess { this.entityList.remove(index); } // CraftBukkit end + } // Spigot this.b(entity); } -- 2.1.0