From 2e5eff98742244885d4f51cc85e297f32cc77599 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Oct 2021 22:36:37 -0500
Subject: [PATCH] Use new account settings flag util

---
 scripts/server/account.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/server/account.js b/scripts/server/account.js
index 576c8c3c..dc87f17e 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -1200,25 +1200,31 @@ function loadAccountMessagesFromDatabase(accountDatabaseID) {
 // ===========================================================================
 
 function isAccountAutoIPLoginEnabled(accountData) {
-	return isAccountSettingFlagEnabled(accountData.settings, getAccountSettingsFlagValue("autoLoginIP"));
+	return isAccountSettingFlagEnabled(accountData, getAccountSettingsFlagValue("autoLoginIP"));
+}
+
+// ===========================================================================
+
+function doesPlayerHaveAutoIPLoginEnabled(client) {
+	return isAccountAutoIPLoginEnabled(getPlayerData(client).accountData);
 }
 
 // ===========================================================================
 
 function doesPlayerHaveGUIEnabled(client) {
-	return !isAccountSettingFlagEnabled(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("noGUI"));
+	return !isAccountSettingFlagEnabled(getPlayerData(client).accountData, getAccountSettingsFlagValue("noGUI"));
 }
 
 // ===========================================================================
 
 function doesPlayerHaveLogoEnabled(client) {
-	return !isAccountSettingFlagEnabled(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("noServerLogo"));
+	return !isAccountSettingFlagEnabled(getPlayerData(client).accountData, getAccountSettingsFlagValue("noServerLogo"));
 }
 
 // ===========================================================================
 
 function doesPlayerHaveAutoSelectLastCharacterEnabled(client) {
-	return isAccountSettingFlagEnabled(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("autoSelectLastCharacter"));
+	return isAccountSettingFlagEnabled(getPlayerData(client).accountData, getAccountSettingsFlagValue("autoSelectLastCharacter"));
 }
 
 // ===========================================================================
@@ -1321,11 +1327,7 @@ function sendAccountLoginSuccessNotification(emailAddress, name, ip, game = getS
 // ===========================================================================
 
 function isAccountSettingFlagEnabled(accountData, flagValue) {
-	if(hasBitFlag(accountData.settings, flagValue)) {
-		return true;
-	}
-
-	return false;
+	return hasBitFlag(accountData.settings, flagValue);
 }
 
-// ===========================================================================
\ No newline at end of file
+// ===========================================================================t
\ No newline at end of file