Paper/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch

43 lines
2.4 KiB
Diff
Raw Normal View History

2021-06-16 06:53:50 +02:00
From 0000000000000000000000000000000000000000 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/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
2023-06-08 07:21:04 +02:00
index 92aa1428e723b377c12bfd20cd1e6b4242ad1261..79e23503b7082633de654f04575b8323ea887e44 100644
2021-06-16 06:53:50 +02:00
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
2023-06-08 07:21:04 +02:00
@@ -721,6 +721,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2021-06-16 06:53:50 +02:00
// Spigot start
// Iterator iterator = this.blockEntityTickers.iterator();
int tilesThisCycle = 0;
2021-06-17 03:43:30 +02:00
+ var toRemove = new it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet<TickingBlockEntity>(net.minecraft.Util.identityStrategy()); // Paper - use removeAll
2021-06-16 06:53:50 +02:00
+ toRemove.add(null);
for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
2023-06-08 07:21:04 +02:00
@@ -728,7 +730,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2021-06-16 06:53:50 +02:00
if (tickingblockentity == null) {
this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
tilesThisCycle--;
- this.blockEntityTickers.remove(this.tileTickPosition--);
continue;
}
// Spigot end
2023-06-08 07:21:04 +02:00
@@ -736,12 +737,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2021-06-16 06:53:50 +02:00
if (tickingblockentity.isRemoved()) {
// Spigot start
tilesThisCycle--;
- this.blockEntityTickers.remove(this.tileTickPosition--);
+ toRemove.add(tickingblockentity); // Paper - use removeAll
// Spigot end
2022-06-07 22:45:38 +02:00
} else if (this.shouldTickBlocksAt(tickingblockentity.getPos())) {
2021-06-16 06:53:50 +02:00
tickingblockentity.tick();
}
}
+ this.blockEntityTickers.removeAll(toRemove);
timings.tileEntityTick.stopTiming(); // Spigot
this.tickingBlockEntities = false;