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-10-31 22:30:18 +01:00
index 57c52a30d284332361f28d6138d3c5f1fc6d52bd..25e2baf2109b27887e4b3631d948907d9d8d65a2 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-10-27 18:11:15 +01:00
@@ -327,6 +327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2024-09-19 16:36:07 +02:00
public final double[] recentTps = new double[ 3 ];
2024-01-23 12:06:27 +01:00
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
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-10-31 22:30:18 +01:00
@@ -1626,7 +1627,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2024-10-27 18:11:15 +01:00
gameprofilerfiller.push("commandFunctions");
2022-09-24 06:48:42 +02:00
this.getFunctions().tick();
2024-10-23 23:12:09 +02:00
gameprofilerfiller.popPush("levels");
2022-09-24 06:48:42 +02:00
- 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-10-31 22:30:18 +01:00
@@ -1654,6 +1655,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2024-10-27 18:11:15 +01:00
}
}
2022-06-04 23:48:24 +02:00
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-10-27 18:11:15 +01:00
@@ -1687,6 +1690,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2024-10-23 23:12:09 +02:00
gameprofilerfiller.pop();
2024-10-31 22:30:18 +01:00
worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
2022-06-04 23:48:24 +02:00
}
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
2024-10-23 23:12:09 +02:00
gameprofilerfiller.popPush("connection");
2024-10-27 18:11:15 +01:00
this.tickConnection();
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
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
index 4b894223387bf4029bbfa15d9605247935d7f829..557eb1a75a3115c3215315deae56a42d665693df 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-10-27 18:11:15 +01:00
@@ -919,6 +919,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-10-27 18:11:15 +01:00
@@ -1182,6 +1187,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-10-27 18:11:15 +01:00
@@ -1358,6 +1364,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;
}