diff options
| author | Jason Penilla <[email protected]> | 2024-10-25 18:13:48 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-10-25 18:13:48 -0700 |
| commit | b14d336442a1928e21ad2eb28768bd0632961682 (patch) | |
| tree | dd02314a0ac260cb903724c66f90b63cac31c6df /patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch | |
| parent | be2edeac2b42ab3d76d9462cd7fab584e13dee9c (diff) | |
| download | Paper-b14d336442a1928e21ad2eb28768bd0632961682.tar.gz Paper-b14d336442a1928e21ad2eb28768bd0632961682.zip | |
Apply watchdoge patches
Diffstat (limited to 'patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch')
| -rw-r--r-- | patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch index f00d649d81..8b66f840f1 100644 --- a/patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch +++ b/patches/server/0703-Throw-exception-on-world-create-while-being-ticked.patch @@ -7,7 +7,7 @@ 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 ef493a1e91252a4ad34c5ac2666b8177b78d611d..546df95fb97684f4a7e90a06b80a1715adbe46c0 100644 +index 3b0f7e7a5bea786f1189d6e47d8dfd7107d66a53..8fe1514bdc6b2e81a10e445952bd71afa5892552 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -328,6 +328,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -18,7 +18,7 @@ index ef493a1e91252a4ad34c5ac2666b8177b78d611d..546df95fb97684f4a7e90a06b80a1715 public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) { AtomicReference<S> atomicreference = new AtomicReference(); -@@ -1658,7 +1659,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -1659,7 +1660,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa this.getFunctions().tick(); MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper gameprofilerfiller.popPush("levels"); @@ -27,7 +27,7 @@ index ef493a1e91252a4ad34c5ac2666b8177b78d611d..546df95fb97684f4a7e90a06b80a1715 // CraftBukkit start // Run tasks that are waiting on processing -@@ -1690,6 +1691,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -1691,6 +1692,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa // Paper end - Perf: Optimize time updates MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper @@ -36,7 +36,7 @@ index ef493a1e91252a4ad34c5ac2666b8177b78d611d..546df95fb97684f4a7e90a06b80a1715 while (iterator.hasNext()) { ServerLevel worldserver = (ServerLevel) iterator.next(); worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent -@@ -1724,6 +1727,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -1725,6 +1728,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa gameprofilerfiller.pop(); gameprofilerfiller.pop(); } |