Merge branch 'master' into pre/1.12

Spigot-Server-Patches/0211-Properly-handle-async-calls-to-restart-the-server.patch

@@ -1,4 +1,4 @@
-From 8a440893d6d24e50beb7b2af0e00f2563142893a Mon Sep 17 00:00:00 2001
+From be5defaa5ff4f435f770d33606670e0271d1cf32 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -78,7 +78,7 @@ index 40514d042..f0743e6cc 100644
          return this.serverThread;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index bc2322e62..a43588598 100644
+index 072de1f71..4483beeba 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1361,10 +1361,15 @@ public abstract class PlayerList {
@@ -107,16 +107,14 @@ index bc2322e62..a43588598 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 49768734d..e1bc3e64e 100644
+index 49768734d..d51636c8e 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
-@@ -45,88 +45,119 @@ public class RestartCommand extends Command
+@@ -45,88 +45,123 @@ public class RestartCommand extends Command
          AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us
          try
          {
 -            if ( script.isFile() )
--            {
--                System.out.println( "Attempting to restart with " + SpigotConfig.restartScript );
 +            // Paper - extract method and cleanup
 +            boolean isRestarting = addShutdownHook(script);
 +            if (isRestarting) {
@@ -124,48 +122,17 @@ index 49768734d..e1bc3e64e 100644
 +            } else {
 +                System.out.println( "Startup script '" + SpigotConfig.restartScript + "' does not exist! Stopping server." );
 +            }
- 
++
--                // Disable Watchdog
--                WatchdogThread.doStop();
 +            // Stop the watchdog
 +            WatchdogThread.doStop();
- 
++
--                // Kick all players
--                for ( EntityPlayer p : (List< EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
--                {
--                    p.playerConnection.disconnect(SpigotConfig.restartMessage);
--                }
--                // Give the socket a chance to send the packets
--                try
--                {
--                    Thread.sleep( 100 );
--                } catch ( InterruptedException ex )
--                {
--                }
--                // Close the socket so we can rebind with the new process
--                MinecraftServer.getServer().getServerConnection().b();
--
--                // Give time for it to kick in
--                try
--                {
--                    Thread.sleep( 100 );
--                } catch ( InterruptedException ex )
--                {
--                }
 +            shutdownServer(isRestarting);
 +        } catch ( Exception ex )
 +        {
 +            ex.printStackTrace();
 +        }
 +    }
- 
++
--                // Actually shutdown
--                try
--                {
--                    MinecraftServer.getServer().stop();
--                } catch ( Throwable t )
--                {
--                }
 +    // Paper start - sync copied from above with minor changes, async added
 +    private static void shutdownServer(boolean isRestarting)
 +    {
@@ -181,9 +148,58 @@ index 49768734d..e1bc3e64e 100644
 +            {
 +                Thread.sleep( 100 );
 +            } catch ( InterruptedException ex )
+             {
+-                System.out.println( "Attempting to restart with " + SpigotConfig.restartScript );
++            }
+ 
+-                // Disable Watchdog
+-                WatchdogThread.doStop();
++            closeSocket();
+ 
+-                // Kick all players
+-                for ( EntityPlayer p : (List< EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
+-                {
+-                    p.playerConnection.disconnect(SpigotConfig.restartMessage);
+-                }
+-                // Give the socket a chance to send the packets
+-                try
+-                {
+-                    Thread.sleep( 100 );
+-                } catch ( InterruptedException ex )
+-                {
+-                }
+-                // Close the socket so we can rebind with the new process
+-                MinecraftServer.getServer().getServerConnection().b();
++            // Actually shutdown
++            try
++            {
++                MinecraftServer.getServer().stop();
++            } catch ( Throwable t )
 +            {
 +            }
  
+-                // Give time for it to kick in
+-                try
+-                {
+-                    Thread.sleep( 100 );
+-                } catch ( InterruptedException ex )
+-                {
+-                }
++            // Actually stop the JVM
++            System.exit(0);
+ 
+-                // Actually shutdown
+-                try
+-                {
+-                    MinecraftServer.getServer().stop();
+-                } catch ( Throwable t )
+-                {
+-                }
++        } else
++        {
++            // Mark the server to shutdown at the end of the tick
++            MinecraftServer.getServer().safeShutdown(isRestarting);
+ 
 -                // This will be done AFTER the server has completely halted
 -                Thread shutdownHook = new Thread()
 -                {
@@ -209,24 +225,19 @@ index 49768734d..e1bc3e64e 100644
 -                        }
 -                    }
 -                };
-+            closeSocket();
  
 -                shutdownHook.setDaemon( true );
 -                Runtime.getRuntime().addShutdownHook( shutdownHook );
 -            } else
-+            // Actually shutdown
++            // wait 10 seconds to see if we're actually going to try shutdown
 +            try
++            {
++                Thread.sleep(10000);
++            }
++            catch (InterruptedException ignored)
              {
 -                System.out.println( "Startup script '" + SpigotConfig.restartScript + "' does not exist! Stopping server." );
-+                MinecraftServer.getServer().stop();
+-
-+            } catch ( Throwable t )
-+            {
-+            }
-+        } else
-+        {
-+            // Mark the server to shutdown at the end of the tick
-+            MinecraftServer.getServer().safeShutdown(isRestarting);
- 
 -                // Actually shutdown
 -                try
 -                {
@@ -234,14 +245,6 @@ index 49768734d..e1bc3e64e 100644
 -                } catch ( Throwable t )
 -                {
 -                }
-+
-+            // wait 10 seconds to see if we're actually going to try shutdown
-+            try
-+            {
-+                Thread.sleep(10000);
-+            }
-+            catch (InterruptedException ignored)
-+            {
              }
 +
 +            // Check if we've actually hit a state where the server is going to safely shutdown