Fixed load queries going through map changes

HotoCocoaco · Feb 2, 2023 · 8c120cf · 8c120cf
1 parent 652123c
commit 8c120cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/addons/sourcemod/scripting/store/sql.sp b/addons/sourcemod/scripting/store/sql.sp
@@ -170,7 +170,7 @@ public void SQLCallback_LoadClientInventory_Credits(Handle owner, Handle hndl, c
 	else
 	{
 		int client = GetClientOfUserId(userid);
-		if(!client)
+		if (!client || !IsClientInGame(client))
 			return;
 
 		char m_szQuery[256];
@@ -226,7 +226,7 @@ public void SQLCallback_LoadClientInventory_Items(Handle owner, Handle hndl, con
 	else
 	{	
 		int client = GetClientOfUserId(userid);
-		if(!client)
+		if (!client || !IsClientInGame(client))
 			return;
 
 		char m_szQuery[256];
@@ -280,7 +280,7 @@ public void SQLCallback_LoadClientInventory_Equipment(Handle owner, Handle hndl,
 	else
 	{
 		int client = GetClientOfUserId(userid);
-		if(!client)
+		if (!client || !IsClientInGame(client))
 			return;
 
 		char m_szUniqueId[PLATFORM_MAX_PATH];

diff --git a/addons/sourcemod/scripting/store_combine.sp b/addons/sourcemod/scripting/store_combine.sp
@@ -3596,7 +3596,7 @@ public void SQLCallback_LoadClientInventory_Credits(Handle owner, Handle hndl, c
 	else
 	{
 		int client = GetClientOfUserId(userid);
-		if(!client)
+		if (!client || !IsClientInGame(client))
 			return;
 
 		char m_szQuery[256];
@@ -3652,7 +3652,7 @@ public void SQLCallback_LoadClientInventory_Items(Handle owner, Handle hndl, con
 	else
 	{	
 		int client = GetClientOfUserId(userid);
-		if(!client)
+		if (!client || !IsClientInGame(client))
 			return;
 
 		char m_szQuery[256];
@@ -3706,7 +3706,7 @@ public void SQLCallback_LoadClientInventory_Equipment(Handle owner, Handle hndl,
 	else
 	{
 		int client = GetClientOfUserId(userid);
-		if(!client)
+		if (!client || !IsClientInGame(client))
 			return;
 
 		char m_szUniqueId[PLATFORM_MAX_PATH];
@@ -4092,10 +4092,7 @@ public void Store_SellItem(int client,int itemid)
 
 	g_eClients[client].iCredits += m_iCredits;
 	//Chat(client, "%t", "Chat Sold Item", g_eItems[itemid].szName, g_eTypeHandlers[g_eItems[itemid].iHandler].szType);
-	if (IsClientInGame(client)) // Prevents a rare error case where a restricted item would be auto-sold during a map change
-	{
-		CPrintToChat(client, "%s%t", g_sChatPrefix, "Chat Sold Item", g_eItems[itemid].szName, g_eTypeHandlers[g_eItems[itemid].iHandler].szType);
-	}
+	CPrintToChat(client, "%s%t", g_sChatPrefix, "Chat Sold Item", g_eItems[itemid].szName, g_eTypeHandlers[g_eItems[itemid].iHandler].szType);
 
 	Store_UnequipItem(client, itemid);