Paper-Old/Spigot-Server-Patches/0204-Fix-MC-117075-TE-Unload-Lag-Spike.patch

From b9797501f8ee9331f216cf6fd44327bcef579c94 Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Wed, 9 Aug 2017 17:51:22 -0500
Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike


diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6fe8ce96aa..6d314a7124 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1286,7 +1286,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
         this.methodProfiler.c("blockEntities");
         timings.tileEntityTick.startTiming(); // Spigot
         if (!this.tileEntityListUnload.isEmpty()) {
-            this.tileEntityListTick.removeAll(this.tileEntityListUnload);
+            // Paper start - Use alternate implementation with faster contains
+            java.util.Set<TileEntity> toRemove = java.util.Collections.newSetFromMap(new java.util.IdentityHashMap<>());
+            toRemove.addAll(tileEntityListUnload);
+            this.tileEntityListTick.removeAll(toRemove);
+            // Paper end
             //this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list
             this.tileEntityListUnload.clear();
         }
-- 
2.18.0
[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types 2018-08-06 01:46:43 +02:00			`From b9797501f8ee9331f216cf6fd44327bcef579c94 Mon Sep 17 00:00:00 2001`
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281 2017-08-10 01:11:57 +02:00			`From: mezz <tehgeek@gmail.com>`
			`Date: Wed, 9 Aug 2017 17:51:22 -0500`
			`Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike`


			`diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java`
[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types 2018-08-06 01:46:43 +02:00			`index 6fe8ce96aa..6d314a7124 100644`
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281 2017-08-10 01:11:57 +02:00			`--- a/src/main/java/net/minecraft/server/World.java`
			`+++ b/src/main/java/net/minecraft/server/World.java`
update upstream 2018-07-29 18:42:07 +02:00			`@@ -1286,7 +1286,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose`
Update to 1.12.2, May the Tacos be with you 2017-09-18 13:04:01 +02:00			`this.methodProfiler.c("blockEntities");`
Fix race condition with chunks, dead tile entities Fixes PaperMC/Paper#883 same issue as MinecraftForge/MinecraftForge#4386 A more detailed anaylsis of what is probably going on, courtesy of @bs2609 and the MCForge Issue Tracker is: When a chunk is unloaded, the entities and tile entities it contains are marked for removal. The actual removal (from the world) occurs later, when the world ticks its entities. Conversely, when a chunk is loaded, it generally adds its entities to the world promptly, without queuing. Here's the normal sequence of events: Chunk unloaded Old entities removed Chunk loaded New entities added However, what can happen: Chunk unloaded Chunk loaded New entities added Old entities removed This occurs when an unloaded chunk is reloaded before its corresponding entities have been removed. 2017-09-12 04:21:57 +02:00			`timings.tileEntityTick.startTiming(); // Spigot`
			`if (!this.tileEntityListUnload.isEmpty()) {`
			`- this.tileEntityListTick.removeAll(this.tileEntityListUnload);`
			`+ // Paper start - Use alternate implementation with faster contains`
			`+ java.util.Set<TileEntity> toRemove = java.util.Collections.newSetFromMap(new java.util.IdentityHashMap<>());`
			`+ toRemove.addAll(tileEntityListUnload);`
			`+ this.tileEntityListTick.removeAll(toRemove);`
			`+ // Paper end`
			`//this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list`
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281 2017-08-10 01:11:57 +02:00			`this.tileEntityListUnload.clear();`
			`}`
			`--`
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches. 2018-07-04 09:55:24 +02:00			`2.18.0`
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281 2017-08-10 01:11:57 +02:00