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

37 lines
1.1 KiB
Diff
Raw Normal View History

2017-04-30 09:32:32 +10:00
From cbc1a502d89b35905d04bd3cb045938fc14262fd 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
2017-04-30 09:32:32 +10:00
index 3b5402bd..8b9e47cf 100644
--- 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;
import com.google.common.base.Function;
import com.google.common.base.Objects;
2017-03-15 20:51:00 +11:00
@@ -1118,6 +1118,7 @@ public abstract class World implements IBlockAccess {
this.everyoneSleeping();
}
+ if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking
2016-11-17 12:41:12 +11:00
int i = entity.ab;
int j = entity.ad;
2017-03-15 20:51:00 +11:00
@@ -1134,6 +1135,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end
+ } // Spigot
2016-03-01 08:33:06 +11:00
this.c(entity);
}
--
2017-04-30 09:32:32 +10:00
2.11.0