From 01e927f85714a62e61024242d9d1490353bd8a35 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 30 Jul 2019 16:11:11 +0000
Subject: [PATCH] Removed pointless delays when shutting down.

---
 .../org/l2jmobius/gameserver/Shutdown.java    | 34 ++-----------------
 .../loginserver/LoginController.java          |  7 ----
 .../l2jmobius/loginserver/LoginServer.java    |  1 -
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
index 44bd7d8f87..548d97794f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
@@ -45,7 +45,8 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.thread.LoginServerThread;
 
 /**
- * This class provides the functions for shutting down and restarting the server It closes all open client connections and saves all data.
+ * This class provides the functions for shutting down and restarting the server.<br>
+ * It closes all open client connections and saves all data.
  * @version $Revision: 1.2.4.6 $ $Date: 2009/05/12 19:45:09 $
  */
 public class Shutdown extends Thread
@@ -371,11 +372,6 @@ public class Shutdown extends Thread
 			DatabaseBackup.performBackup();
 		}
 		
-		System.runFinalization();
-		System.gc();
-		
-		LOGGER.info("Memory cleanup, recycled unused objects.");
-		
 		LOGGER.info("[STATUS] Server shutdown successfully.");
 		
 		if (_instance._shutdownMode == GM_RESTART)
@@ -432,36 +428,12 @@ public class Shutdown extends Thread
 			LOGGER.warning("Error saving offline shops. " + t);
 		}
 		
-		try
-		{
-			wait(1000);
-		}
-		catch (InterruptedException e1)
-		{
-		}
-		
 		// Disconnect all the players from the server
 		disconnectAllCharacters();
 		
-		try
-		{
-			wait(5000);
-		}
-		catch (InterruptedException e1)
-		{
-		}
-		
 		// Save players data!
 		saveAllPlayers();
 		
-		try
-		{
-			wait(10000);
-		}
-		catch (InterruptedException e1)
-		{
-		}
-		
 		// Seven Signs data is now saved along with Festival data.
 		if (!SevenSigns.getInstance().isSealValidationPeriod())
 		{
@@ -525,7 +497,7 @@ public class Shutdown extends Thread
 		
 		try
 		{
-			wait(5000);
+			Thread.sleep(5000);
 		}
 		catch (InterruptedException e)
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java
index 55aa587855..339bcc9f08 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java
@@ -174,13 +174,6 @@ public class LoginController
 	public void shutdown()
 	{
 		_stopNow = true;
-		try
-		{
-			Thread.sleep(10000);
-		}
-		catch (Exception e)
-		{
-		}
 	}
 	
 	private void generateBlowFishKeys()
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
index b2284712e9..04269f3868 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
@@ -203,7 +203,6 @@ public class LoginServer
 		}
 		
 		LoginController.getInstance().shutdown();
-		System.gc();
 		Runtime.getRuntime().exit(restart ? 2 : 0);
 	}