From 7383cba61f689a96e8072ca5ed4e398468cf489f Mon Sep 17 00:00:00 2001
From: rtldg <55846624+rtldg@users.noreply.github.com>
Date: Tue, 5 Oct 2021 16:17:01 +0000
Subject: [PATCH] remove duplicate map tier retreival

---
 addons/sourcemod/scripting/shavit-rankings.sp | 56 +++++--------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/addons/sourcemod/scripting/shavit-rankings.sp b/addons/sourcemod/scripting/shavit-rankings.sp
index 6899801d..fd4c87c1 100644
--- a/addons/sourcemod/scripting/shavit-rankings.sp
+++ b/addons/sourcemod/scripting/shavit-rankings.sp
@@ -382,52 +382,12 @@ public void OnMapStart()
 	gI_Tier = gCV_DefaultTier.IntValue;
 
 	char sQuery[512];
-	FormatEx(sQuery, sizeof(sQuery), "SELECT tier FROM %smaptiers WHERE map = '%s';", gS_MySQLPrefix, gS_Map);
-	gH_SQL.Query(SQL_GetMapTier_Callback, sQuery);
+	FormatEx(sQuery, sizeof(sQuery), "SELECT map, tier FROM %smaptiers;", gS_MySQLPrefix);
+	gH_SQL.Query(SQL_FillTierCache_Callback, sQuery, 0, DBPrio_High);
 
 	gB_TierQueried = true;
 }
 
-public void SQL_GetMapTier_Callback(Database db, DBResultSet results, const char[] error, any data)
-{
-	if(results == null)
-	{
-		LogError("Timer (rankings, get map tier) error! Reason: %s", error);
-
-		return;
-	}
-
-	#if defined DEBUG
-	PrintToServer("DEBUG: 2 (SQL_GetMapTier_Callback)");
-	#endif
-
-	if(results.RowCount > 0 && results.FetchRow())
-	{
-		gI_Tier = results.FetchInt(0);
-
-		#if defined DEBUG
-		PrintToServer("DEBUG: 3 (tier: %d) (SQL_GetMapTier_Callback)", gI_Tier);
-		#endif
-
-		RecalculateCurrentMap();
-		UpdateAllPoints();
-
-		#if defined DEBUG
-		PrintToServer("DEBUG: 4 (SQL_GetMapTier_Callback)");
-		#endif
-	}
-	else
-	{
-		char sQuery[512];
-		FormatEx(sQuery, sizeof(sQuery), "REPLACE INTO %smaptiers (map, tier) VALUES ('%s', %d);", gS_MySQLPrefix, gS_Map, gI_Tier);
-		gH_SQL.Query(SQL_SetMapTier_Callback, sQuery, gI_Tier, DBPrio_High);
-	}
-
-	char sQuery[256];
-	FormatEx(sQuery, 256, "SELECT map, tier FROM %smaptiers;", gS_MySQLPrefix);
-	gH_SQL.Query(SQL_FillTierCache_Callback, sQuery, 0, DBPrio_High);
-}
-
 public void SQL_FillTierCache_Callback(Database db, DBResultSet results, const char[] error, any data)
 {
 	if(results == null)
@@ -458,6 +418,18 @@ public void SQL_FillTierCache_Callback(Database db, DBResultSet results, const c
 	}
 
 	SortADTArray(gA_ValidMaps, Sort_Ascending, Sort_String);
+
+	if (gA_MapTiers.GetValue(gS_Map, gI_Tier))
+	{
+		RecalculateCurrentMap();
+		UpdateAllPoints();
+	}
+	else
+	{
+		char sQuery[512];
+		FormatEx(sQuery, sizeof(sQuery), "REPLACE INTO %smaptiers (map, tier) VALUES ('%s', %d);", gS_MySQLPrefix, gS_Map, gI_Tier);
+		gH_SQL.Query(SQL_SetMapTier_Callback, sQuery, gI_Tier, DBPrio_High);
+	}
 }
 
 public void OnMapEnd()