testserver/CraftBukkit-Patches/0093-Fix-ConcurrentModifica...

31 lines
998 B
Diff
Raw Normal View History

2015-02-26 10:40:16 +00:00
From f665effb267d8740b909cf1c2c32dae1916b5a2f Mon Sep 17 00:00:00 2001
2014-11-28 01:17:45 +00:00
From: Thinkofdeath <thethinkofdeath@gmail.com>
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
2015-01-05 03:32:01 +00:00
index 59bd847..1fe5cf9 100644
2014-11-28 01:17:45 +00:00
--- 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 {
2014-11-28 01:17:45 +00:00
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 {
2014-11-28 01:17:45 +00:00
this.entityList.remove(index);
}
// CraftBukkit end
+ } // Spigot
this.b(entity);
}
--
2.1.0