2014-01-18 19:36:47 +00:00
|
|
|
From 056226c0ebd85eceb6bc83d35f12220d118bc4dc Mon Sep 17 00:00:00 2001
|
2014-01-14 20:14:36 +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
|
|
|
|
|
index 04f5ed1..ac9b669 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
|
|
|
@@ -1038,16 +1038,19 @@ public abstract class World implements IBlockAccess {
|
|
|
|
|
this.players.remove(entity);
|
|
|
|
|
this.everyoneSleeping();
|
|
|
|
|
}
|
|
|
|
|
+ // Spigot start
|
|
|
|
|
+ if (!guardEntityList) { // It will get removed after the tick if we are ticking
|
|
|
|
|
+ int i = entity.ai;
|
|
|
|
|
+ int j = entity.ak;
|
|
|
|
|
|
|
|
|
|
- int i = entity.ai;
|
|
|
|
|
- int j = entity.ak;
|
|
|
|
|
+ if (entity.ah && this.isChunkLoaded(i, j)) {
|
|
|
|
|
+ this.getChunkAt(i, j).b(entity);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
- if (entity.ah && this.isChunkLoaded(i, j)) {
|
|
|
|
|
- this.getChunkAt(i, j).b(entity);
|
|
|
|
|
+ this.entityList.remove(entity);
|
|
|
|
|
+ this.b(entity);
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
- this.entityList.remove(entity);
|
|
|
|
|
- this.b(entity);
|
|
|
|
|
+ // Spigot end
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addIWorldAccess(IWorldAccess iworldaccess) {
|
|
|
|
|
--
|
|
|
|
|
1.8.4.msysgit.0
|
|
|
|
|
|
