2019-04-22 21:36:14 +00:00
|
|
|
From 15cd669dcb33567293742d5942ca735b544822d1 Mon Sep 17 00:00:00 2001
|
2017-08-09 23:11:57 +00: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
|
2019-04-06 03:08:45 +00:00
|
|
|
index 5e1ab431dc..cdb430ef4f 100644
|
2017-08-09 23:11:57 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2019-04-06 03:08:45 +00:00
|
|
|
@@ -1274,7 +1274,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2018-12-17 05:18:06 +00:00
|
|
|
this.methodProfiler.exitEnter("blockEntities");
|
2017-09-12 02:21:57 +00: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
|
2017-08-09 23:11:57 +00:00
|
|
|
this.tileEntityListUnload.clear();
|
|
|
|
|
}
|
|
|
|
|
--
|
2019-03-20 01:46:00 +00:00
|
|
|
2.21.0
|
2017-08-09 23:11:57 +00:00
|
|
|
|
