spigot/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch

31 lines
998 B
Diff
Raw Normal View History

2014-11-29 20:44:07 +00:00
From 40320636ba9d3cf4e0a577bcfdd9dcd69d3c276e Mon Sep 17 00:00:00 2001
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
2014-11-29 20:44:07 +00:00
index d96968c..d8c2f13 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2014-11-29 20:44:07 +00:00
@@ -1045,6 +1045,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;
2014-11-29 20:44:07 +00:00
@@ -1061,6 +1062,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end
+ } // Spigot
this.b(entity);
}
--
2.1.0