From a562fecb4b6bc8f16dfebc309269f602f26a0962 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 23 Mar 2014 01:54:55 +0100 Subject: [PATCH] Fix TileEntities getting ticked after being queued for removal --- ...-getting-ticked-after-being-queued-f.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 CraftBukkit-Patches/0127-Fix-TileEntities-getting-ticked-after-being-queued-f.patch diff --git a/CraftBukkit-Patches/0127-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0127-Fix-TileEntities-getting-ticked-after-being-queued-f.patch new file mode 100644 index 0000000000..85433c7ea2 --- /dev/null +++ b/CraftBukkit-Patches/0127-Fix-TileEntities-getting-ticked-after-being-queued-f.patch @@ -0,0 +1,38 @@ +From 21c02e2e18bf05f41a934f259d3c80547d5c24fb Mon Sep 17 00:00:00 2001 +From: FrozenBrain +Date: Sun, 23 Mar 2014 01:49:13 +0100 +Subject: [PATCH] Fix TileEntities getting ticked after being queued for + removal + + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 7529e0c..45bc215 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -1358,6 +1358,12 @@ public abstract class World implements IBlockAccess { + timings.entityTick.stopTiming(); // Spigot + this.methodProfiler.c("blockEntities"); + timings.tileEntityTick.startTiming(); // Spigot ++ // Spigot start - brought up from below ++ if (!this.b.isEmpty()) { ++ this.tileEntityList.removeAll(this.b); ++ this.b.clear(); ++ } ++ // Spigot End + this.M = true; + Iterator iterator = this.tileEntityList.iterator(); + +@@ -1406,10 +1412,6 @@ public abstract class World implements IBlockAccess { + timings.tileEntityTick.stopTiming(); // Spigot + timings.tileEntityPending.startTiming(); // Spigot + this.M = false; +- if (!this.b.isEmpty()) { +- this.tileEntityList.removeAll(this.b); +- this.b.clear(); +- } + + this.methodProfiler.c("pendingBlockEntities"); + if (!this.a.isEmpty()) { +-- +1.8.3.2 +