From fb6addf9e6b064b33b7973e7359a25175f686635 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 24 Sep 2022 05:48:42 +0100
Subject: [PATCH] Fix mangled patch

---
 ...on-world-create-unload-while-being-t.patch | 65 -------------------
 ...n-on-world-create-while-being-ticked.patch | 10 +++
 2 files changed, 10 insertions(+), 65 deletions(-)
 delete mode 100644 patches/server/Throw-exception-on-world-create-unload-while-being-t.patch

diff --git a/patches/server/Throw-exception-on-world-create-unload-while-being-t.patch b/patches/server/Throw-exception-on-world-create-unload-while-being-t.patch
deleted file mode 100644
index 28f87a9d1a..0000000000
--- a/patches/server/Throw-exception-on-world-create-unload-while-being-t.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 22 Mar 2022 12:44:30 -0700
-Subject: [PATCH] Throw exception on world create/unload while being ticked
-
-There are no plans to support creating worlds while worlds are
-being ticked themselves.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     public volatile Thread shutdownThread; // Paper
-     public volatile boolean abnormalExit = false; // Paper
-+    public boolean isIteratingOverLevels = false; // Paper
- 
-     public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
-         AtomicReference<S> atomicreference = new AtomicReference();
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.getFunctions().tick();
-         MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
-         this.profiler.popPush("levels");
--        Iterator iterator = this.getAllLevels().iterator();
- 
-         // CraftBukkit start
-         // Run tasks that are waiting on processing
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         // Paper end
-         MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
- 
-+        this.isIteratingOverLevels = true; // Paper
-+        Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
-         while (iterator.hasNext()) {
-             ServerLevel worldserver = (ServerLevel) iterator.next();
-             worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.profiler.pop();
-             worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
-         }
-+        this.isIteratingOverLevels = false; // Paper
- 
-         this.profiler.popPush("connection");
-         MinecraftTimings.connectionTimer.startTiming(); // Spigot
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     @Override
-     public World createWorld(WorldCreator creator) {
-         Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
-+        Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper
-         Validate.notNull(creator, "Creator may not be null");
- 
-         String name = creator.name();
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
- 
-     @Override
-     public boolean unloadWorld(World world, boolean save) {
-+        Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot unload a world while worlds are being ticked"); // Paper
-         if (world == null) {
-             return false;
-         }
diff --git a/patches/server/Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/Throw-exception-on-world-create-while-being-ticked.patch
index 72b4562750..a41c84d961 100644
--- a/patches/server/Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/Throw-exception-on-world-create-while-being-ticked.patch
@@ -18,11 +18,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.getFunctions().tick();
+         MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
+         this.profiler.popPush("levels");
+-        Iterator iterator = this.getAllLevels().iterator();
++        //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
+ 
+         // CraftBukkit start
+         // Run tasks that are waiting on processing
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
 +        this.isIteratingOverLevels = true; // Paper
++        Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper