Paper/CraftBukkit-Patches/0090-Guard-Entity-List.patch

80 lines
2.8 KiB
Diff
Raw Normal View History

From 3d2444de9d3dff2136780f07577b970a123a19cb 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 a09de8e..2788061 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2015-03-16 11:19:21 +01:00
@@ -37,7 +37,32 @@ public abstract class World implements IBlockAccess {
2015-02-28 12:36:22 +01:00
private int a = 63;
2014-11-28 02:17:45 +01:00
protected boolean e;
2015-02-28 12:36:22 +01:00
- public final List<Entity> entityList = Lists.newArrayList();
+ // Spigot start - guard entity list from removals
2015-02-28 12:36:22 +01:00
+ public final List<Entity> entityList = new java.util.ArrayList<Entity>()
+ {
+ @Override
2015-02-28 12:36:22 +01:00
+ public Entity 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
2015-02-28 12:36:22 +01:00
protected final List<Entity> g = Lists.newArrayList();
public final List<TileEntity> h = Lists.newArrayList();
public final List<TileEntity> tileEntityList = Lists.newArrayList();
2015-03-16 11:19:21 +01:00
@@ -105,6 +130,7 @@ public abstract class World implements IBlockAccess {
2014-11-28 02:17:45 +01:00
private int tickPosition;
// Spigot start
+ private boolean guardEntityList;
2014-11-28 02:17:45 +01:00
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
2015-03-16 11:19:21 +01:00
@@ -1344,6 +1370,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);
2015-03-16 11:19:21 +01:00
@@ -1380,12 +1407,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");
--
2015-05-09 22:23:26 +02:00
2.1.4