From e177666bfb645d88da066363c9068ed054783d51 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:27:38 -0400 Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. --- ...Remove-unused-World-Tile-Entity-List.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch diff --git a/Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch new file mode 100644 index 0000000000..7b3c8cb5b5 --- /dev/null +++ b/Spigot-Server-Patches/0134-Remove-unused-World-Tile-Entity-List.patch @@ -0,0 +1,71 @@ +From d4d3e808798c72164a72ef0b9046d95ab2bb6af6 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 13 Apr 2016 00:25:28 -0400 +Subject: [PATCH] Remove unused World Tile Entity List + +Massive hit to performance and it is completely unnecessary. + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 220a942..3241803 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess { + }; + // Spigot end + protected final Set f = Sets.newHashSet(); // Paper +- public final List tileEntityList = Lists.newArrayList(); ++ //public final List tileEntityList = Lists.newArrayList(); // Paper - remove unused list + public final List tileEntityListTick = Lists.newArrayList(); + private final List b = Lists.newArrayList(); + private final Set tileEntityListUnload = Sets.newHashSet(); // Paper +@@ -1564,7 +1564,7 @@ public abstract class World implements IBlockAccess { + // CraftBukkit start - From below, clean up tile entities before ticking them + if (!this.tileEntityListUnload.isEmpty()) { + this.tileEntityListTick.removeAll(this.tileEntityListUnload); +- this.tileEntityList.removeAll(this.tileEntityListUnload); ++ //this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list + this.tileEntityListUnload.clear(); + } + // CraftBukkit end +@@ -1615,7 +1615,7 @@ public abstract class World implements IBlockAccess { + if (tileentity.x()) { + tilesThisCycle--; + this.tileEntityListTick.remove(tileTickPosition--); +- this.tileEntityList.remove(tileentity); ++ //this.tileEntityList.remove(tileentity); // Paper - remove unused list + if (this.isLoaded(tileentity.getPosition())) { + this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition()); + } +@@ -1653,7 +1653,7 @@ public abstract class World implements IBlockAccess { + this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3); + // CraftBukkit start + // From above, don't screw this up - SPIGOT-1746 +- if (!this.tileEntityList.contains(tileentity1)) { ++ if (true) { // Paper - remove unused list + this.a(tileentity1); + } + // CraftBukkit end +@@ -1673,9 +1673,9 @@ public abstract class World implements IBlockAccess { + protected void l() {} + + public boolean a(TileEntity tileentity) { +- boolean flag = this.tileEntityList.add(tileentity); ++ boolean flag = true; // Paper - remove unused list + +- if (flag && tileentity instanceof ITickable) { ++ if (flag && tileentity instanceof ITickable && !this.tileEntityListTick.contains(tileentity)) { // Paper + this.tileEntityListTick.add(tileentity); + } + +@@ -2144,7 +2144,7 @@ public abstract class World implements IBlockAccess { + } else { + if (tileentity != null) { + this.b.remove(tileentity); +- this.tileEntityList.remove(tileentity); ++ //this.tileEntityList.remove(tileentity); // Paper - remove unused list + this.tileEntityListTick.remove(tileentity); + } + +-- +2.8.1 +