Skip to content

Commit dfa3ca4

Browse files
committed
Check if MinecraftServer#getServer() is null in watchdog thread
Prevents throwing errors during testing
1 parent 6529990 commit dfa3ca4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

folia-server/minecraft-patches/features/0008-Add-watchdog-thread.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ of the ticking region should help debug the cause.
88

99
diff --git a/io/papermc/paper/threadedregions/FoliaWatchdogThread.java b/io/papermc/paper/threadedregions/FoliaWatchdogThread.java
1010
new file mode 100644
11-
index 0000000000000000000000000000000000000000..258d82ab2c78482e1561343e8e1f81fc33f1895e
11+
index 0000000000000000000000000000000000000000..e9ca1a15049b0211d10401cb78e953b93afaf6c7
1212
--- /dev/null
1313
+++ b/io/papermc/paper/threadedregions/FoliaWatchdogThread.java
1414
@@ -0,0 +1,104 @@
@@ -63,7 +63,7 @@ index 0000000000000000000000000000000000000000..258d82ab2c78482e1561343e8e1f81fc
6363
+ Thread.sleep(1000L);
6464
+ } catch (final InterruptedException ex) {}
6565
+
66-
+ if (MinecraftServer.getServer().hasStopped()) {
66+
+ if (MinecraftServer.getServer() == null || MinecraftServer.getServer().hasStopped()) {
6767
+ continue;
6868
+ }
6969
+
@@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..258d82ab2c78482e1561343e8e1f81fc
117117
+ }
118118
+}
119119
diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
120-
index 2fd27993b445cd8c3b517a91746c3f303a35238d..7123b3eb2f2e52946b8ef9de993a6828eb0bb6f7 100644
120+
index e392457ccc06d3c6ad794f3c480d301a46083054..fa6b8d756195c1b430cc11214a901bd42eebc98d 100644
121121
--- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
122122
+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
123123
@@ -34,6 +34,13 @@ public final class TickRegionScheduler {

0 commit comments

Comments
 (0)