80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
|
From 90be9eaab308e864147a8b1d132993ccfa5b0e30 Mon Sep 17 00:00:00 2001
|
||
|
|
From: md_5 <git@md-5.net>
|
||
|
|
Date: Mon, 10 Mar 2014 09:03:28 +1100
|
||
|
|
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 c0a4bea..61fa519 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||
|
|
@@ -30,7 +30,32 @@ import org.bukkit.event.weather.ThunderChangeEvent;
|
||
|
|
public abstract class World implements IBlockAccess {
|
||
|
|
|
||
|
|
public boolean d;
|
||
|
|
- public List entityList = new ArrayList();
|
||
|
|
+ // Spigot start - guard entity list from removals
|
||
|
|
+ public List entityList = new ArrayList()
|
||
|
|
+ {
|
||
|
|
+ @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 +103,7 @@ public abstract class World implements IBlockAccess {
|
||
|
|
int[] I;
|
||
|
|
|
||
|
|
// Spigot start
|
||
|
|
+ private boolean guardEntityList;
|
||
|
|
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
|
||
|
|
protected float growthOdds = 100;
|
||
|
|
protected float modifiedOdds = 100;
|
||
|
|
@@ -1270,6 +1296,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);
|
||
|
|
@@ -1318,12 +1345,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.3.2
|
||
|
|
|