37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 660e6ebd7b74506ecaf13fbbfe38eebf7fafa49c 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 d9da020..7765812 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;
|
|
@@ -1042,6 +1042,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;
|
|
|
|
@@ -1058,6 +1059,7 @@ public abstract class World implements IBlockAccess {
|
|
this.entityList.remove(index);
|
|
}
|
|
// CraftBukkit end
|
|
+ } // Spigot
|
|
this.c(entity);
|
|
}
|
|
|
|
--
|
|
2.5.0
|
|
|