Paper/CraftBukkit-Patches/0051-Guard-entity-list.patch

73 lines
2.5 KiB
Diff
Raw Normal View History

2013-12-22 00:05:27 +01:00
From f0939f62fe3bf4860dc5380e3346ee5cb0dfe649 Mon Sep 17 00:00:00 2001
2013-08-03 19:04:58 +02:00
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
2013-12-22 00:05:27 +01:00
index 13ca7fa..5b0875d 100644
2013-08-03 19:04:58 +02:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2013-12-03 05:13:39 +01:00
@@ -30,7 +30,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
2013-08-03 19:04:58 +02:00
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();
2013-12-09 08:00:58 +01:00
@@ -78,6 +96,7 @@ public abstract class World implements IBlockAccess {
2013-12-01 04:40:53 +01:00
int[] I;
2013-08-03 19:04:58 +02:00
// Spigot start
+ private boolean guardEntityList = false;
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
2013-12-22 00:05:27 +01:00
@@ -1243,6 +1262,7 @@ public abstract class World implements IBlockAccess {
2013-08-03 19:04:58 +02:00
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
+ guardEntityList = true; // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
2013-12-22 00:05:27 +01:00
@@ -1290,12 +1310,15 @@ public abstract class World implements IBlockAccess {
2013-08-03 19:04:58 +02:00
this.getChunkAt(j, k).b(entity);
}
2013-08-03 19:04:58 +02:00
+ guardEntityList = false; // Spigot
this.entityList.remove(i--);
+ guardEntityList = true; // Spigot
this.b(entity);
}
this.methodProfiler.b();
}
+ guardEntityList = false; // Spigot
timings.entityTick.stopTiming(); // Spigot
2013-12-01 04:40:53 +01:00
this.methodProfiler.c("blockEntities");
2013-08-03 19:04:58 +02:00
--
2013-11-27 12:01:50 +01:00
1.8.3.2
2013-08-03 19:04:58 +02:00