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

Move part of the Watchdog patch back into the correct patch

Browse Source 
I have no idea how I managed to mess this up
This commit is contained in:
Thinkofdeath 2014-03-24 17:51:06 +00:00
parent f5643a1d34
commit 7fd79ff28d
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CraftBukkit-Patches/0059-Watchdog-Thread.patch
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

23
CraftBukkit-Patches/0061-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 801e2763278c04fdae00d5c825364fcc11d39ce9 Mon Sep 17 00:00:00 2001
From eaf48249ff3561debf47c07f8661150de7295caa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -101,27 +101,6 @@ index d5903b7..3b626be 100644
public boolean getCollidesWithEntities()
{
return getHandle().collidesWithEntities;
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
index a8840c9..922981e 100644
--- a/src/main/java/org/spigotmc/RestartCommand.java
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -44,7 +44,6 @@ public class RestartCommand extends Command
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
@@ -54,7 +53,7 @@ public class RestartCommand extends Command
{
}
// 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
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2ea1be7..08bd5ba 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java