From 9d4c096a5dbf7be41f305ae452071b1cc01b30ab Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 6 Feb 2022 12:06:12 -0600
Subject: [PATCH] Don't save clan if not needed

---
 scripts/server/clan.js | 63 +++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/scripts/server/clan.js b/scripts/server/clan.js
index 9b378e3c..0155dd4d 100644
--- a/scripts/server/clan.js
+++ b/scripts/server/clan.js
@@ -948,6 +948,10 @@ function saveClanToDatabase(clanId) {
 		return false;
 	}
 
+    if(!tempClanData.needsSaved) {
+        return false;
+    }
+
 	let dbConnection = connectToDatabase();
 	if(dbConnection) {
 		if(tempClanData.needsSaved) {
@@ -990,40 +994,41 @@ function saveClanToDatabase(clanId) {
 function saveClanRankToDatabase(clanId, rankId) {
 	let tempClanRankData = getClanRankData(clanId, rankId);
 
+    if(!tempClanRankData.needsSaved) {
+        return false;
+    }
+
 	let dbConnection = connectToDatabase();
 	if(dbConnection) {
-		if(tempClanRankData.needsSaved) {
-			let safeName = escapeDatabaseString(dbConnection, tempClanRankData.name);
-			let safeTag = escapeDatabaseString(dbConnection, tempClanRankData.customTag);
-			//let safeTitle = escapeDatabaseString(dbConnection, tempClanRankData.name);
+        let safeName = escapeDatabaseString(dbConnection, tempClanRankData.name);
+        let safeTag = escapeDatabaseString(dbConnection, tempClanRankData.customTag);
+        //let safeTitle = escapeDatabaseString(dbConnection, tempClanRankData.name);
 
-			let data = [
-				["clan_rank_name", safeName],
-				["clan_rank_clan", tempClanRankData.clan],
-				["clan_rank_custom_tag", safeTag],
-				//["clan_rank_title", safeTitle],
-				["clan_rank_flags", tempClanRankData.flags],
-				["clan_rank_level", tempClanRankData.level],
-				["clan_rank_enabled", boolToInt(tempClanRankData.enabled)],
-			];
+        let data = [
+            ["clan_rank_name", safeName],
+            ["clan_rank_clan", tempClanRankData.clan],
+            ["clan_rank_custom_tag", safeTag],
+            //["clan_rank_title", safeTitle],
+            ["clan_rank_flags", tempClanRankData.flags],
+            ["clan_rank_level", tempClanRankData.level],
+            ["clan_rank_enabled", boolToInt(tempClanRankData.enabled)],
+        ];
 
-			let dbQuery = null;
-			if(tempClanRankData.databaseId == 0) {
-				let queryString = createDatabaseInsertQuery("clan_rank", data);
-				dbQuery = queryDatabase(dbConnection, queryString);
-				getClanRankData(clanId, rankId).databaseId = getDatabaseInsertId(dbConnection);
-				getClanRankData(clanId, rankId).needsSaved = false;
-			} else {
-				let queryString = createDatabaseUpdateQuery("clan_rank", data, `clan_rank_id=${tempClanRankData.databaseId} LIMIT 1`);
-				dbQuery = queryDatabase(dbConnection, queryString);
-				getClanRankData(clanId, rankId).needsSaved = false;
-			}
-
-			freeDatabaseQuery(dbQuery);
-			disconnectFromDatabase(dbConnection);
-			return true;
-		}
+        let dbQuery = null;
+        if(tempClanRankData.databaseId == 0) {
+            let queryString = createDatabaseInsertQuery("clan_rank", data);
+            dbQuery = queryDatabase(dbConnection, queryString);
+            getClanRankData(clanId, rankId).databaseId = getDatabaseInsertId(dbConnection);
+            getClanRankData(clanId, rankId).needsSaved = false;
+        } else {
+            let queryString = createDatabaseUpdateQuery("clan_rank", data, `clan_rank_id=${tempClanRankData.databaseId} LIMIT 1`);
+            dbQuery = queryDatabase(dbConnection, queryString);
+            getClanRankData(clanId, rankId).needsSaved = false;
+        }
 
+        freeDatabaseQuery(dbQuery);
+        disconnectFromDatabase(dbConnection);
+        return true;
 	}
 
 	return false;