feedback

neoforged · Feb 11, 2025 · 5bcc0a6 · 5bcc0a6
1 parent 5b3cc7d
commit 5bcc0a6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/patches/net/minecraft/server/level/ServerLevel.java.patch b/patches/net/minecraft/server/level/ServerLevel.java.patch
@@ -112,15 +112,13 @@
          this.getProfiler().pop();
 
          for (Entity entity : p_8648_.getPassengers()) {
-@@ -807,6 +_,12 @@
+@@ -807,6 +_,10 @@
              } else {
                  this.entityManager.autoSave();
              }
 +            net.neoforged.neoforge.common.NeoForge.EVENT_BUS.post(new net.neoforged.neoforge.event.level.LevelEvent.Save(this));
 +            if (p_8645_) {
 +                net.neoforged.neoforge.common.IOUtilities.waitUntilIOWorkerComplete();
-+            } else {
-+                net.neoforged.neoforge.common.IOUtilities.clearWorkerWhenDone();
 +            }
          }
      }

diff --git a/src/main/java/net/neoforged/neoforge/common/IOUtilities.java b/src/main/java/net/neoforged/neoforge/common/IOUtilities.java
@@ -160,10 +160,6 @@ public static void withIOWorker(Runnable task) {
         saveDataTasks = saveDataTasks.thenRunAsync(task, Util.ioPool());
     }
 
-    public static void clearWorkerWhenDone() {
-        withIOWorker(() -> saveDataTasks = CompletableFuture.completedFuture(null));
-    }
-
     public static void waitUntilIOWorkerComplete() {
         saveDataTasks.join();
         saveDataTasks = CompletableFuture.completedFuture(null);