fix(database): Map Change crash

skuzzis · skuzzis · commit c962c8d0a639 · 2024-08-28T13:58:55.000Z
diff --git a/src/plugins/core/scripting/database.cpp b/src/plugins/core/scripting/database.cpp
@@ -11,6 +11,7 @@
 std::string FetchPluginName(lua_State* state);
 #define FetchPluginByState(state) g_pluginManager->FetchPlugin(FetchPluginName(state))
 
+extern std::string currentMap;
 struct DatabaseQueryQueue
 {
     std::string query;
@@ -83,7 +84,7 @@ void DatabaseQueryThread()
                     }
                     };
 
-                if (g_playerManager->GetPlayers() > 0) g_Plugin.NextFrame(ExecuteCallback);
+                if (currentMap != "None") g_Plugin.NextFrame(ExecuteCallback);
                 else ExecuteCallback();
             }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`std::string FetchPluginName(lua_State* state);`
`12`	`12`	`#define FetchPluginByState(state) g_pluginManager->FetchPlugin(FetchPluginName(state))`
`13`	`13`
	`14`	`+extern std::string currentMap;`
`14`	`15`	`struct DatabaseQueryQueue`
`15`	`16`	`{`
`16`	`17`	`std::string query;`
`@@ -83,7 +84,7 @@ void DatabaseQueryThread()`
`83`	`84`	`}`
`84`	`85`	`};`
`85`	`86`
`86`		`- if (g_playerManager->GetPlayers() > 0) g_Plugin.NextFrame(ExecuteCallback);`
	`87`	`+ if (currentMap != "None") g_Plugin.NextFrame(ExecuteCallback);`
`87`	`88`	`else ExecuteCallback();`
`88`	`89`	`}`
`89`	`90`