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
2024-06-19 19:29:03 +02:00
index 2408e5afb9096aa991742983bb573040fbfdb5cb..56ab40965ca6034ed430d4d5c4be99fa69a3a453 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
2024-06-14 03:30:23 +02:00
@@ -318,6 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2024-01-23 12:06:27 +01:00
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
public static long currentTickLong = 0L; // Paper - track current tick as a long
2024-01-18 18:52:00 +01:00
+ public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
2022-06-04 23:48:24 +02:00
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
2024-06-14 03:30:23 +02:00
@@ -1583,7 +1584,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();
2024-01-18 18:52:00 +01:00
+ //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
2022-09-24 06:48:42 +02:00
// CraftBukkit start
// Run tasks that are waiting on processing
2024-06-14 03:30:23 +02:00
@@ -1615,6 +1616,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2024-01-21 13:56:22 +01:00
// Paper end - Perf: Optimize time updates
2022-06-04 23:48:24 +02:00
MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
2024-01-18 18:52:00 +01:00
+ this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
+ Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
2022-06-04 23:48:24 +02:00
while (iterator.hasNext()) {
ServerLevel worldserver = (ServerLevel) iterator.next();
2024-02-01 10:15:57 +01:00
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
2024-06-19 19:29:03 +02:00
@@ -1650,6 +1653,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
}
2024-01-18 18:52:00 +01:00
+ this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
2022-06-04 23:48:24 +02:00
this.profiler.popPush("connection");
2023-12-06 17:21:56 +01:00
MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
2022-06-04 23:48:24 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2024-06-14 14:11:52 +02:00
index 5a56e2b05f993dc1333ffb6e280d7bba97e305d7..986bbc91b82d3062ef1bf1542dd264f4154a7ea1 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
2024-06-14 03:30:23 +02:00
@@ -907,6 +907,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;
}
2024-06-14 03:30:23 +02:00
@@ -1169,6 +1174,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();
2024-06-14 03:30:23 +02:00
@@ -1345,6 +1351,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;
}