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

From bf2acf1bc8d0a4281451a2bf074bfa3b0b9956ec 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 b85c55168..90f946e57 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1572,7 +1572,11 @@ public abstract class World implements IBlockAccess {
         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
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			`From bf2acf1bc8d0a4281451a2bf074bfa3b0b9956ec 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`
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			`index b85c55168..90f946e57 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 2017-12-09 18:37:09 +01:00			`@@ -1572,7 +1572,11 @@ public abstract class World implements IBlockAccess {`
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