PaperMC/Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch

From 05b26d3750481e193a73014ff04a7a41fdefc34c 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 785611f0e2..b17215edf4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1323,7 +1323,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
         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.19.0
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag 2018-09-29 01:31:59 +02:00			`From 05b26d3750481e193a73014ff04a7a41fdefc34c 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`
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix 2018-09-18 03:50:02 +02:00			`index 785611f0e2..b17215edf4 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`
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix 2018-09-18 03:50:02 +02:00			`@@ -1323,7 +1323,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc`
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();`
			`}`
			`--`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled 2018-09-15 18:10:26 +02:00			`2.19.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