core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the restart command sometimes deadlocking the server

This commit is contained in:
Thinkofdeath 2014-06-14 16:01:05 +01:00
parent f2c8426b20
commit 7f6d9d1fb7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CraftBukkit-Patches/0057-Watchdog-Thread.patch
View File

@ -1,4 +1,4 @@
From 682ead1a06abe0e2bdf3237c8ffa05c4b260d72e Mon Sep 17 00:00:00 2001 From c839e6555ebfc524efef5b69ec68d1bc61f18087 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100 Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread. Subject: [PATCH] Watchdog Thread.
@ -26,10 +26,10 @@ index 007fb86..51f1761 100644
} }
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644 new file mode 100644
index 0000000..10cb7c4 index 0000000..429c258
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,117 @@ @@ -0,0 +1,124 @@
+package org.spigotmc; +package org.spigotmc;
+ +
+import java.io.File; +import java.io.File;
@ -55,8 +55,15 @@ index 0000000..10cb7c4
+ { + {
+ if ( testPermission( sender ) ) + if ( testPermission( sender ) )
+ { + {
+ MinecraftServer.getServer().processQueue.add( new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ restart(); + restart();
+ } + }
+ } );
+ }
+ return true; + return true;
+ } + }
+ +