From 1ed04d32cf8d6f33537f180c051a2f83bdbb14ce Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 03:28:54 -0700
Subject: [PATCH] Fix account not found issue when logging in

---
 .../server/dispatch/DispatchServer.java       | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index dab6ba0a4..f13b9dc2f 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -226,18 +226,22 @@ public final class DispatchServer {
 			Account account = DatabaseHelper.getAccountByName(requestData.account);
 			
 			// Check if account exists, else create a new one.
-			if (account == null && Grasscutter.getConfig().ServerOptions.AutomaticallyCreateAccounts) {
-				// This account has been created AUTOMATICALLY. There will be no permissions added.
-				account = DatabaseHelper.createAccountWithId(requestData.account, 0);
-				
-				responseData.message = "OK";
-				responseData.data.account.uid = account.getId();
-				responseData.data.account.token = account.generateSessionKey();
-				responseData.data.account.email = account.getEmail();
-			} else if (!Grasscutter.getConfig().ServerOptions.AutomaticallyCreateAccounts) {
-				responseData.retcode = -201;
-				responseData.message = "Username not found.";
+			if (account == null) {
+				// Account doesnt exist, so we can either auto create it if the config value is set
+				if (Grasscutter.getConfig().ServerOptions.AutomaticallyCreateAccounts) {
+					// This account has been created AUTOMATICALLY. There will be no permissions added.
+					account = DatabaseHelper.createAccountWithId(requestData.account, 0);
+					
+					responseData.message = "OK";
+					responseData.data.account.uid = account.getId();
+					responseData.data.account.token = account.generateSessionKey();
+					responseData.data.account.email = account.getEmail();
+				} else {
+					responseData.retcode = -201;
+					responseData.message = "Username not found.";
+				} 
 			} else {
+				// Account was found, log the player in
 				responseData.message = "OK";
 				responseData.data.account.uid = account.getId();
 				responseData.data.account.token = account.generateSessionKey();