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

31 lines
998 B
Diff
Raw Normal View History

2015-06-01 09:22:52 +00:00
From f30bc46839bc5d173791365409c15f9eff964b73 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-06-01 09:22:52 +00:00
index dd0b347..6297c05 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
2015-03-16 10:19:21 +00:00
@@ -1093,6 +1093,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;
2015-03-16 10:19:21 +00:00
@@ -1109,6 +1110,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);
}
--
2015-05-09 20:23:26 +00:00
2.1.4
2014-11-28 01:17:45 +00:00