31 lines
998 B
Diff
31 lines
998 B
Diff
|
From 6a4a46f7eaa9666f3ac0bcd72ddffab97d43ae48 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
|
||
|
|
index 59a2c58..763ea9d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||
|
|
@@ -1031,6 +1031,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;
|
||
|
|
|
||
|
|
@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess {
|
||
|
|
this.entityList.remove(index);
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
+ } // Spigot
|
||
|
|
this.b(entity);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|