core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0208-Fix-MC-117075-TE-Unloa...

27 lines
1.3 KiB
Diff
Raw Normal View History

NOT FINISHED! 1.13-pre7 - even more patches! Patches, patches everywhere!
2018-07-18 00:08:13 +00:00
From b69d46e941e9c3325ea3d85e3a0a667122ea3081 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-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
NOT FINISHED! 1.13-pre7 - even more patches! Patches, patches everywhere!
2018-07-18 00:08:13 +00:00
index 0ba99bcbc..49e7c1589 100644
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281
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
NOT FINISHED! 1.13-pre7 - even more patches! Patches, patches everywhere!
2018-07-18 00:08:13 +00:00
@@ -1275,7 +1275,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
Update to 1.12.2, May the Tacos be with you
2017-09-18 11:04:01 +00: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 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
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281
2017-08-09 23:11:57 +00: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 07:55:24 +00:00
2.18.0
Fix MC-117075: TE Unload Lag Spike PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281
2017-08-09 23:11:57 +00:00