throw exception if worlds are created while being ticked (#7653)
This commit is contained in:
		
					parent
					
						
							
								a1e0eeef38
							
						
					
				
			
			
				commit
				
					
						7acc5223e6
					
				
			
		
					 1 changed files with 48 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -0,0 +1,48 @@
 | 
			
		|||
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
 | 
			
		||||
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
 | 
			
		||||
         // Paper end
 | 
			
		||||
         MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
 | 
			
		||||
 
 | 
			
		||||
+        this.isIteratingOverLevels = true; // Paper
 | 
			
		||||
         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(!console.levels.isEmpty(), "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();
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue