port Significantly improve performance of the end generation (#7919)

2022-06-10 10:11:41 -04:00 · 2022-06-10 10:11:41 -04:00 · a8a01bbb52
commit a8a01bbb52
parent cf384f5269
382 changed files with 110 additions and 112 deletions
--- a/patches/server/0863-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0863-Fix-save-problems-on-shutdown.patch
@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sat, 5 Mar 2022 17:12:52 -0800
-Subject: [PATCH] Fix save problems on shutdown
-
- Save level.dat first, in case the shutdown is killed later
- Force run minecraftserver tasks and the chunk source tasks
-  while waiting for the chunk system to empty, as there's simply
-  too much trash that could prevent them from executing during
-  the chunk source tick (i.e "time left in tick" logic).
- Set forceTicks to true, so that player packets are always
-  processed so that the main process queue can be drained
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1bc400cf245ba3110e8874a4f2837a91d0f70916..60de49a9888b6dfe17dcb0d9dd0dd3d2e7d829aa 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -953,6 +953,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             }
-         }
- 
-+        // Paper start - let's be a little more intelligent around crashes
-+        // make sure level.dat saves
-+        for (ServerLevel level : this.getAllLevels()) {
-+            level.saveLevelDat();
-+        }
-+        // Paper end - let's be a little more intelligent around crashes
-+
-         while (this.levels.values().stream().anyMatch((worldserver1) -> {
-             return worldserver1.getChunkSource().chunkMap.hasWork();
-         })) {
-@@ -965,9 +972,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 worldserver.getChunkSource().tick(() -> {
-                     return true;
-                 }, false);
-+                while (worldserver.getChunkSource().pollTask()); // Paper - drain tasks
-             }
- 
-            this.waitUntilNextTick();
-+            this.forceTicks = true; // Paper
-+            while (this.pollTask()); // Paper - drain tasks
-         }
- 
-         this.saveAllChunks(false, true, false);
-@@ -1264,6 +1273,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
- 
-     private boolean haveTime() {
-+        // Paper start
-+        if (this.forceTicks) {
-+            return true;
-+        }
-+        // Paper end
-         // CraftBukkit start
-         if (isOversleep) return canOversleep();// Paper - because of our changes, this logic is broken
-         return this.forceTicks || this.runningTask() || Util.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cf3622930aab7ff62e293622ab1cd5ff97ee68f5..de0fe1743dbddc6ff548dc4c658955266600180f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1278,7 +1278,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             }
- 
-         }
-+        // Paper start
-+        this.saveLevelDat();
-+    }
- 
-+    public void saveLevelDat() {
-+        this.saveLevelData();
-+        // Paper end
-         // CraftBukkit start - moved from MinecraftServer.saveChunks
-         ServerLevel worldserver1 = this;
-