Paper/CraftBukkit-Patches/0081-Fix-ConcurrentModificationException-while-being-idle.patch

37 lines
1.1 KiB
Diff
Raw Normal View History

2016-03-06 04:36:33 +01:00
From 660e6ebd7b74506ecaf13fbbfe38eebf7fafa49c Mon Sep 17 00:00:00 2001
2014-11-28 02:17:45 +01: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
2016-03-06 04:36:33 +01:00
index d9da020..7765812 100644
2014-11-28 02:17:45 +01:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2016-02-29 22:33:06 +01: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;
2016-03-06 04:36:33 +01:00
@@ -1042,6 +1042,7 @@ public abstract class World implements IBlockAccess {
2014-11-28 02:17:45 +01:00
this.everyoneSleeping();
}
+ if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking
2016-02-29 22:33:06 +01:00
int i = entity.ab;
int j = entity.ad;
2014-11-28 02:17:45 +01:00
2016-03-06 04:36:33 +01:00
@@ -1058,6 +1059,7 @@ public abstract class World implements IBlockAccess {
2014-11-28 02:17:45 +01:00
this.entityList.remove(index);
}
// CraftBukkit end
+ } // Spigot
2016-02-29 22:33:06 +01:00
this.c(entity);
2014-11-28 02:17:45 +01:00
}
--
2016-02-29 22:33:06 +01:00
2.5.0
2014-11-28 02:17:45 +01:00