85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
From 38c40e66efdfe76a60e5c1e508dc21bae94b4733 Mon Sep 17 00:00:00 2001
|
|
From: Ammar Askar <ammar@ammaraskar.com>
|
|
Date: Sat, 3 Aug 2013 21:42:00 +0500
|
|
Subject: [PATCH] Guard entity list
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 5fb3fbf..0923296 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
|
|
public abstract class World implements IBlockAccess {
|
|
|
|
public boolean d;
|
|
- public List entityList = new ArrayList();
|
|
+ public List entityList = new ArrayList() { // Spigot start - guard entity list from removals
|
|
+ @Override
|
|
+ public Object remove(int index) {
|
|
+ guard();
|
|
+ return super.remove(index);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean remove(Object o) {
|
|
+ guard();
|
|
+ return super.remove(o);
|
|
+ }
|
|
+
|
|
+ private void guard() {
|
|
+ if (guardEntityList) {
|
|
+ throw new java.util.ConcurrentModificationException();
|
|
+ }
|
|
+ }
|
|
+ }; // Spigot end
|
|
protected List f = new ArrayList();
|
|
public Set tileEntityList = new HashSet(); // CraftBukkit - ArrayList -> HashSet
|
|
private List a = new ArrayList();
|
|
@@ -78,6 +96,7 @@ public abstract class World implements IBlockAccess {
|
|
int[] I;
|
|
|
|
// Spigot start
|
|
+ private boolean guardEntityList = false;
|
|
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
|
|
protected float growthOdds = 100;
|
|
protected float modifiedOdds = 100;
|
|
@@ -1032,7 +1051,12 @@ public abstract class World implements IBlockAccess {
|
|
if (index <= this.tickPosition) {
|
|
this.tickPosition--;
|
|
}
|
|
+ // Spigot start
|
|
+ boolean isGuarding = guardEntityList;
|
|
+ guardEntityList = false;
|
|
this.entityList.remove(index);
|
|
+ guardEntityList = isGuarding;
|
|
+ // Spigot end
|
|
}
|
|
// CraftBukkit end
|
|
|
|
@@ -1252,6 +1276,7 @@ public abstract class World implements IBlockAccess {
|
|
|
|
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
|
|
timings.entityTick.startTiming(); // Spigot
|
|
+ guardEntityList = true; // Spigot
|
|
// CraftBukkit start - Use field for loop variable
|
|
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
|
|
entity = (Entity) this.entityList.get(this.tickPosition);
|
|
@@ -1300,12 +1325,15 @@ public abstract class World implements IBlockAccess {
|
|
this.getChunkAt(j, k).b(entity);
|
|
}
|
|
|
|
+ guardEntityList = false; // Spigot
|
|
this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable
|
|
+ guardEntityList = true; // Spigot
|
|
this.b(entity);
|
|
}
|
|
|
|
this.methodProfiler.b();
|
|
}
|
|
+ guardEntityList = false; // Spigot
|
|
|
|
timings.entityTick.stopTiming(); // Spigot
|
|
this.methodProfiler.c("blockEntities");
|
|
--
|
|
1.8.4.msysgit.0
|
|
|