From 5ab9c6a9c76d929e62545965647b4bd9226a6dd7 Mon Sep 17 00:00:00 2001
From: Lotto <prozet@live.se>
Date: Mon, 19 Feb 2018 20:41:18 +0100
Subject: [PATCH] Update RememberUsernamePlugin to save the name from the
 vanilla feature

---
 .../RememberUsernamePlugin.java               | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
index 9e0ac069d2..76e2c69540 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
@@ -56,18 +56,6 @@ public class RememberUsernamePlugin extends Plugin
 		applyUsername();
 	}
 
-	protected void shutDown() throws Exception
-	{
-		GameState gameState = client.getGameState();
-		if (gameState == GameState.LOGIN_SCREEN)
-		{
-			if (Objects.equals(config.username(), client.getUsername()))
-			{
-				client.setUsername("");
-			}
-		}
-	}
-
 	@Provides
 	RememberUsernameConfig getConfig(ConfigManager configManager)
 	{
@@ -83,13 +71,20 @@ public class RememberUsernamePlugin extends Plugin
 		}
 		else if (event.getGameState() == GameState.LOGGED_IN)
 		{
-			if (config.username().equals(client.getUsername()))
+			String username = "";
+			
+			if (client.getPreferences().getRememberedUsername() != null)
+			{
+				username = client.getUsername();
+			}
+
+			if (config.username().equals(username))
 			{
 				return;
 			}
 
-			log.debug("Saving username: {}", client.getUsername());
-			config.username(client.getUsername());
+			log.debug("Saving username: {}", username);
+			config.username(username);
 		}
 	}
 
@@ -106,12 +101,13 @@ public class RememberUsernamePlugin extends Plugin
 		if (gameState == GameState.LOGIN_SCREEN)
 		{
 			String username = config.username();
+
 			if (Strings.isNullOrEmpty(username))
 			{
 				return;
 			}
 
-			client.setUsername(username);
+			client.getPreferences().setRememberedUsername(username);
 		}
 	}
 }