2018-01-16 03:13:17 +00:00
|
|
|
From ed3c41e1569e1bf2ccb034d9492a8e0675781bd1 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
|
2018-01-16 03:13:17 +00:00
|
|
|
index b0139fff6..00513d02c 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
|
2017-12-09 17:37:09 +00:00
|
|
|
@@ -1572,7 +1572,11 @@ public abstract class World implements IBlockAccess {
|
2017-09-18 11:04:01 +00:00
|
|
|
this.methodProfiler.c("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();
|
|
|
|
}
|
|
|
|
--
|
2018-01-16 03:13:17 +00:00
|
|
|
2.15.1
|
2017-08-09 23:11:57 +00:00
|
|
|
|