Paper/CraftBukkit-Patches/0081-Fix-ConcurrentModificationException-while-being-idle.patch
2016-03-03 03:46:56 -06:00

37 lines
1.1 KiB
Diff

From aad78355beec91b7347c5a3efe52e2cb987ce175 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
index 2cc87d0..76c5f4c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,4 +1,4 @@
-package net.minecraft.server;
+ package net.minecraft.server;
import com.google.common.base.Function;
import com.google.common.base.Objects;
@@ -1016,6 +1016,7 @@ public abstract class World implements IBlockAccess {
this.everyoneSleeping();
}
+ if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking
int i = entity.ab;
int j = entity.ad;
@@ -1032,6 +1033,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end
+ } // Spigot
this.c(entity);
}
--
2.5.0