From 4d78db78eea3b9c0ad686d1283f5a1c7586c972f Mon Sep 17 00:00:00 2001 From: md_5 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 a35ec3f..703b919 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -33,7 +33,32 @@ import org.bukkit.event.weather.ThunderChangeEvent; public abstract class World implements IBlockAccess { protected boolean e; - public final List entityList = Lists.newArrayList(); + // Spigot start - guard entity list from removals + public List entityList = new java.util.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 final List g = Lists.newArrayList(); public final List h = Lists.newArrayList(); public final List tileEntityList = Lists.newArrayList(); @@ -88,6 +113,7 @@ public abstract class World implements IBlockAccess { private int tickPosition; // Spigot start + private boolean guardEntityList; protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList; protected float growthOdds = 100; protected float modifiedOdds = 100; @@ -1280,6 +1306,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); @@ -1316,12 +1343,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"); -- 2.1.0