2022-06-04 23:48:24 +02:00
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 while being ticked
There are no plans to support creating worlds while worlds are
being ticked themselvess.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2023-08-28 13:05:48 +02:00
index d8747518678596586dccb636d8e9b805260e75a7..42f566c9155b70e04d457eb05934d678a92fcdb1 100644
2022-06-04 23:48:24 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2023-08-28 13:05:48 +02:00
@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2022-06-04 23:48:24 +02:00
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();
2023-08-28 13:05:48 +02:00
@@ -1482,7 +1483,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2022-09-24 06:48:42 +02:00
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
2023-08-28 13:05:48 +02:00
@@ -1514,6 +1515,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2022-06-04 23:48:24 +02:00
// Paper end
MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
+ this.isIteratingOverLevels = true; // Paper
2022-09-24 06:48:42 +02:00
+ Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
2022-06-04 23:48:24 +02:00
while (iterator.hasNext()) {
ServerLevel worldserver = (ServerLevel) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
2023-08-28 13:05:48 +02:00
@@ -1560,6 +1563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2022-06-04 23:48:24 +02:00
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
2023-09-21 18:48:55 +02:00
index 3468fb9e062a3ff0c2229cb75da45955a3d8761c..0a980eb63e6116f91322fd8bf94db7c5dae7b79a 100644
2022-06-04 23:48:24 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2023-09-21 18:48:55 +02:00
@@ -874,6 +874,11 @@ public final class CraftServer implements Server {
2022-09-24 07:19:05 +02:00
return new ArrayList<World>(this.worlds.values());
}
+ @Override
+ public boolean isTickingWorlds() {
+ return console.isIteratingOverLevels;
+ }
+
public DedicatedPlayerList getHandle() {
return this.playerList;
}
2023-09-21 18:48:55 +02:00
@@ -1133,6 +1138,7 @@ public final class CraftServer implements Server {
2022-06-04 23:48:24 +02:00
@Override
public World createWorld(WorldCreator creator) {
2022-08-14 10:03:13 +02:00
Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
2022-09-24 07:19:05 +02:00
+ //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
2023-06-13 01:51:45 +02:00
Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
2022-06-04 23:48:24 +02:00
String name = creator.name();
2023-09-21 18:48:55 +02:00
@@ -1272,6 +1278,7 @@ public final class CraftServer implements Server {
2022-07-01 18:14:50 +02:00
@Override
public boolean unloadWorld(World world, boolean save) {
2022-09-24 07:19:05 +02:00
+ //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot unload a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
2022-07-01 18:14:50 +02:00
if (world == null) {
return false;
}