CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make restart command ignore async checks. This is needed for the watchdog to properly restart.

Browse Source
This commit is contained in:
md_5 2014-03-25 16:13:09 +11:00
parent 5164642604
commit 48d7a1a40f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0059-Watchdog-Thread.patch
View File

@ -1,4 +1,4 @@
From 75e785c9ed946fae0cf2dab990e115e540c8978d Mon Sep 17 00:00:00 2001 From 7ceb5bfffc00229347fb53fea2f20cae5f8bf04d 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,21 +26,18 @@ index f9cbe47..2407ab2 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..922981e index 0000000..2d330fc
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,112 @@ @@ -0,0 +1,110 @@
+package org.spigotmc; +package org.spigotmc;
+ +
+import java.io.File; +import java.io.File;
+import java.util.List; +import java.util.List;
+import net.minecraft.server.EntityPlayer; +import net.minecraft.server.EntityPlayer;
+import net.minecraft.server.IChatBaseComponent;
+import net.minecraft.server.MinecraftServer; +import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.PacketPlayOutKickDisconnect;
+import org.bukkit.command.Command; +import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender; +import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.util.CraftChatMessage;
+ +
+public class RestartCommand extends Command +public class RestartCommand extends Command
+{ +{
@ -65,6 +62,7 @@ index 0000000..922981e
+ +
+ public static void restart() + public static void restart()
+ { + {
+ AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us
+ try + try
+ { + {
+ final File file = new File( SpigotConfig.restartScript ); + final File file = new File( SpigotConfig.restartScript );
@ -289,5 +287,5 @@ index 0000000..de08ad6
+ } + }
+} +}
-- --
1.8.5.2.msysgit.0 1.8.3.2