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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user