2019-05-27 09:13:41 +00:00
|
|
|
From 5a73c1dbbd07e2ebeda89b6ed04edc5694e70697 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-05-27 09:13:41 +00:00
|
|
|
index 6b2769343..3e5c76d32 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-05-27 06:14:14 +00:00
|
|
|
@@ -738,7 +738,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
2019-04-27 23:23:53 +00:00
|
|
|
gameprofilerfiller.enter("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
|
|
|
|
