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

37 lines
1.1 KiB
Diff
Raw Normal View History

2018-01-03 10:36:21 +11:00
From e39fb85920748f06da2858bced7d98c149bd1b07 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-12-09 18:08:16 +11:00
index 5a97b38c7..0653941c3 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;
2017-05-14 12:00:00 +10:00
import com.google.common.base.MoreObjects;
2017-12-09 18:08:16 +11:00
@@ -1121,6 +1121,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-12-09 18:08:16 +11:00
@@ -1137,6 +1138,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-11-17 10:24:35 +11:00
2.14.1