From 417c19e20944336ba7a04dc4771ebfef41ec9f3f Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 30 Aug 2018 06:46:26 -0400
Subject: [PATCH] Revert "Merge pull request #4568 from
 deathbeam/proper-shutdown"

This reverts commit 8d539976853e180cc5b1ef20773ed2143340381b, reversing
changes made to 4f548e835c760f5c5654f94a97b592996daa85f2.

This is crashing on shutdown.
---
 .../main/java/net/runelite/api/GameEngine.java  |  5 -----
 .../main/java/net/runelite/client/RuneLite.java |  6 ------
 .../runelite/client/plugins/PluginManager.java  | 17 -----------------
 .../java/net/runelite/client/ui/ClientUI.java   | 16 ----------------
 .../java/net/runelite/rs/api/RSGameEngine.java  |  3 ---
 5 files changed, 47 deletions(-)

diff --git a/runelite-api/src/main/java/net/runelite/api/GameEngine.java b/runelite-api/src/main/java/net/runelite/api/GameEngine.java
index 1e1ffacbde..7a09406875 100644
--- a/runelite-api/src/main/java/net/runelite/api/GameEngine.java
+++ b/runelite-api/src/main/java/net/runelite/api/GameEngine.java
@@ -51,9 +51,4 @@ public interface GameEngine
 	 * @return true if on the main thread, false otherwise
 	 */
 	boolean isClientThread();
-
-	/**
-	 * Shut downs all open connections and files in client and serializes not serialized data.
-	 */
-	void shutDown();
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
index 229eec62c8..986cf46a6d 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
@@ -35,7 +35,6 @@ import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.Locale;
-import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import javax.inject.Provider;
 import javax.inject.Singleton;
@@ -112,9 +111,6 @@ public class RuneLite
 	@Inject
 	private OverlayManager overlayManager;
 
-	@Inject
-	private ScheduledExecutorService executorService;
-
 	@Inject
 	private Provider<ItemManager> itemManager;
 
@@ -296,10 +292,8 @@ public class RuneLite
 
 	public void shutdown()
 	{
-		pluginManager.stopCorePlugins();
 		clientSessionManager.shutdown();
 		discordService.close();
-		executorService.shutdown();
 	}
 
 	@VisibleForTesting
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index fd7cec8c81..5b0fc62e46 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -214,23 +214,6 @@ public class PluginManager
 		}
 	}
 
-	public void stopCorePlugins()
-	{
-		List<Plugin> scannedPlugins = new ArrayList<>(plugins);
-		for (Plugin plugin : scannedPlugins)
-		{
-			try
-			{
-				stopPlugin(plugin);
-				plugins.remove(plugin);
-			}
-			catch (PluginInstantiationException ex)
-			{
-				log.warn("Unable to stop plugin {}. {}", plugin.getClass().getSimpleName(), ex);
-			}
-		}
-	}
-
 	List<Plugin> scanAndInstantiate(ClassLoader classLoader, String packageName) throws IOException
 	{
 		MutableGraph<Class<? extends Plugin>> graph = GraphBuilder
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
index 7f71a362a2..755f71a245 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
@@ -36,7 +36,6 @@ import java.awt.Graphics;
 import java.awt.GraphicsConfiguration;
 import java.awt.LayoutManager;
 import java.awt.Rectangle;
-import java.awt.SystemTray;
 import java.awt.TrayIcon;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -272,21 +271,6 @@ public class ClientUI
 				{
 					saveClientBoundsConfig();
 					runelite.shutdown();
-
-					if (SystemTray.isSupported())
-					{
-						SystemTray.getSystemTray().remove(trayIcon);
-					}
-
-					if (client != null)
-					{
-						client.stop();
-					}
-
-					if (client instanceof Client)
-					{
-						((Client)client).shutDown();
-					}
 				},
 				this::showWarningOnExit
 			);
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java
index 9c14fd82fd..93f091c0c9 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java
@@ -32,7 +32,4 @@ public interface RSGameEngine extends GameEngine
 {
 	@Import("canvas")
 	Canvas getCanvas();
-
-	@Import("shutDown")
-	void shutDown();
 }