2018-07-22 12:00:00 +10:00
|
|
|
From 16f40ed10458c25decc5da89c6f1925cbf1cde87 Mon Sep 17 00:00:00 2001
|
2014-11-26 08:27:08 +11: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
|
2018-07-22 12:00:00 +10:00
|
|
|
index f751fafa9..4223b219a 100644
|
2014-11-26 08:27:08 +11:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2016-03-01 08:33:06 +11:00
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-package net.minecraft.server;
|
|
|
|
+ package net.minecraft.server;
|
|
|
|
|
2017-05-14 12:00:00 +10:00
|
|
|
import com.google.common.base.MoreObjects;
|
2018-07-15 10:00:00 +10:00
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
@@ -988,6 +988,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
2014-11-26 08:27:08 +11:00
|
|
|
this.everyoneSleeping();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking
|
2018-07-15 10:00:00 +10:00
|
|
|
int i = entity.ae;
|
|
|
|
int j = entity.ag;
|
2014-11-26 08:27:08 +11:00
|
|
|
|
2018-07-15 10:00:00 +10:00
|
|
|
@@ -1004,6 +1005,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
2014-11-26 08:27:08 +11:00
|
|
|
this.entityList.remove(index);
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
+ } // Spigot
|
2016-03-01 08:33:06 +11:00
|
|
|
this.c(entity);
|
2014-11-26 08:27:08 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2018-07-15 10:00:00 +10:00
|
|
|
2.17.1
|
2014-11-26 08:27:08 +11:00
|
|
|
|