Move part of the Watchdog patch back into the correct patch

I have no idea how I managed to mess this up

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-24 17:51:06 +00:00
parent 6cdbf78b0e
commit cd765d61e7
2 changed files with 5 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
From 8316892609dcb021aeb85d249d76a8a350cb42dd Mon Sep 17 00:00:00 2001
From 75e785c9ed946fae0cf2dab990e115e540c8978d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
@@ -26,10 +26,10 @@ index f9cbe47..2407ab2 100644
}
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 0000000..a8840c9
index 0000000..922981e
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,113 @@
@@ -0,0 +1,112 @@
+package org.spigotmc;
+
+import java.io.File;
@@ -76,7 +76,6 @@ index 0000000..a8840c9
+ for ( EntityPlayer p : (List< EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
+ {
+ p.playerConnection.disconnect(SpigotConfig.restartMessage);
+ p.playerConnection.networkManager.d();
+ }
+ // Give the socket a chance to send the packets
+ try
@@ -86,7 +85,7 @@ index 0000000..a8840c9
+ {
+ }
+ // Close the socket so we can rebind with the new process
+ MinecraftServer.getServer().ag().b();
+ MinecraftServer.getServer().ah().b();
+
+ // Give time for it to kick in
+ try