From 35bfd36fe3a58d003058f45666d66b23d2c307a1 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 ecdebeb..776830a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1093,6 +1093,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; @@ -1109,6 +1110,7 @@ public abstract class World implements IBlockAccess { this.entityList.remove(index); } // CraftBukkit end + } // Spigot this.b(entity); } -- 2.1.0