fix(core): Crash on player join

Author: skuzzis

src/convars/convars.h

@@ -28,6 +28,10 @@ class FakeConVar
     std::any GetValue();
 };
 
-extern std::map<std::string, FakeConVar*> fakeConvars;
+bool FakeConvarExists(std::string name);
+FakeConVar* GetFakeConvar(std::string name);
+void DeleteFakeConvar(std::string name);
+std::map<std::string, FakeConVar*> FetchFakeConvars();
+void InsertFakeConvar(std::string name, FakeConVar* cvar);
 
 #endif

src/convars/fake_convars.cpp

@@ -2,6 +2,38 @@
 
 static void convarsCallback(const CCommandContext& context, const CCommand& args);
 std::map<std::string, bool> convarCreated;
+std::map<std::string, FakeConVar*> fakeConvars;
+
+bool FakeConvarExists(std::string name)
+{
+    return (fakeConvars.find(name) != fakeConvars.end());
+}
+
+FakeConVar* GetFakeConvar(std::string name)
+{
+    if (!FakeConvarExists(name)) return nullptr;
+
+    return fakeConvars.at(name);
+}
+
+void DeleteFakeConvar(std::string name)
+{
+    if (!FakeConvarExists(name)) return;
+
+    fakeConvars.erase(name);
+}
+
+std::map<std::string, FakeConVar*> FetchFakeConvars()
+{
+    return fakeConvars;
+}
+
+void InsertFakeConvar(std::string name, FakeConVar* cvar)
+{
+    if (FakeConvarExists(name)) return;
+
+    fakeConvars.insert({ name, cvar });
+}
 
 FakeConVar::FakeConVar(std::string name, EConVarType type, std::any defaultValue, bool prot)
 {

src/convars/shared_convars.cpp

@@ -111,8 +111,8 @@ std::any FetchCVarValue(std::string cvarname)
             return nullptr;
         }
     }
-    else if (fakeConvars.find(cvarname) != fakeConvars.end())
-        return fakeConvars.at(cvarname)->GetValue();
+    else if (FakeConvarExists(cvarname))
+        return GetFakeConvar(cvarname)->GetValue();
 
     return nullptr;
 }
@@ -122,6 +122,6 @@ EConVarType FetchCVarType(std::string cvarname)
     ConVar* cvar = FetchCVar(cvarname);
 
     if (cvar) return cvar->m_eVarType;
-    else if (fakeConvars.find(cvarname) != fakeConvars.end()) return fakeConvars.at(cvarname)->GetType();
+    else if (FakeConvarExists(cvarname)) return GetFakeConvar(cvarname)->GetType();
     else return EConVarType_Invalid;
 }

src/core/commands.cpp

@@ -115,6 +115,8 @@ void SwiftlyStatus(CPlayerSlot slot, CCommandContext context)
 
 void SwiftlyConvarsManager(CPlayerSlot slot, CCommandContext context, int page)
 {
+    auto fakeConvars = FetchFakeConvars();
+
     PrintToClientOrConsole(slot, "Convars", "There are %d convars created by plugins.\n", fakeConvars.size());
     PrintToClientOrConsole(slot, "Convars", "Below will be shown a list of all the convars:\n");
 

src/entrypoint.cpp

@@ -11,7 +11,6 @@
 
 #include "addons/addons.h"
 #include "addons/clients.h"
-#include "convars/convars.h"
 #include "configuration/Configuration.h"
 #include "commands/CommandsManager.h"
 #include "crashreporter/CallStack.h"
@@ -91,8 +90,6 @@ CGameEntitySystem* GameEntitySystem()
 
 CUtlVector<FuncHookBase*> g_vecHooks;
 std::map<std::string, PluginUserMessage> scriptingUserMessages;
-std::map<std::string, FakeConVar*> fakeConvars;
-std::map<std::string, std::string> pluginBasePaths;
 
 Addons g_addons;
 CommandsManager* g_commandsManager = nullptr;

src/plugins/Plugin.h

@@ -49,6 +49,4 @@ class Plugin
     virtual EventResult TriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event) = 0;
 };
 
-extern std::map<std::string, std::string> pluginBasePaths;
-
 #endif

src/plugins/PluginManager.cpp

@@ -193,4 +193,10 @@ EventResult PluginManager::ExecuteEvent(std::string invokedBy, std::string event
 std::vector<Plugin*> PluginManager::GetPluginsList()
 {
     return this->pluginsList;
+}
+
+std::string PluginManager::GetPluginBasePath(std::string plugin_name)
+{
+    if (this->pluginBasePaths.find(plugin_name) == this->pluginBasePaths.end()) return "addons/swiftly/plugins";
+    return this->pluginBasePaths[plugin_name];
 }

src/plugins/PluginManager.h

@@ -17,11 +17,14 @@ class PluginManager
 private:
     std::vector<Plugin*> pluginsList;
     std::map<std::string, Plugin*> pluginsMap;
+    std::map<std::string, std::string> pluginBasePaths;
 
 public:
     PluginManager();
     ~PluginManager();
 
+    std::string GetPluginBasePath(std::string plugin_name);
+
     bool PluginExists(std::string plugin_name);
 
     void LoadPlugins(std::string directory);
@@ -44,6 +47,5 @@ class PluginManager
 };
 
 extern PluginManager* g_pluginManager;
-extern std::map<std::string, std::string> pluginBasePaths;
 
 #endif

src/plugins/core/scripting/convars.cpp

@@ -10,11 +10,11 @@ PluginConvars::PluginConvars(std::string m_plugin_name)
 void PluginConvars::CreateFake(std::string cvarname, int32_t type, std::any defaultValue, bool prot)
 {
     if (type < 0 || type > 14) return;
-    if (fakeConvars.find(cvarname) != fakeConvars.end()) return;
+    if (FakeConvarExists(cvarname)) return;
     if (FetchCVar(cvarname)) return;
 
     auto cvar = new FakeConVar(cvarname, (EConVarType)type, defaultValue, prot);
-    fakeConvars.insert({ cvarname, cvar });
+    InsertFakeConvar(cvarname, cvar);
 }
 
 void PluginConvars::CreateFakeLua(std::string cvarname, int32_t type, luabridge::LuaRef defaultValue, bool prot)
@@ -83,11 +83,11 @@ void PluginConvars::CreateFakeLua(std::string cvarname, int32_t type, luabridge:
 
 void PluginConvars::DeleteFake(std::string cvarname)
 {
-    if (fakeConvars.find(cvarname) == fakeConvars.end()) return;
+    if (!FakeConvarExists(cvarname)) return;
 
-    auto cvar = fakeConvars.at(cvarname);
+    auto cvar = GetFakeConvar(cvarname);
     delete cvar;
-    fakeConvars.erase(cvarname);
+    DeleteFakeConvar(cvarname);
 }
 
 std::any PluginConvars::GetConvarValue(std::string cvarname)

src/plugins/core/scripting/utils.cpp

@@ -41,7 +41,7 @@ std::string scripting_GetPluginPath(std::string plugin_name)
     Plugin* plugin = g_pluginManager->FetchPlugin(plugin_name);
     if (!plugin) return "";
 
-    return string_format("%s/%s", pluginBasePaths[plugin_name].c_str(), plugin->GetName().c_str());
+    return string_format("%s/%s", g_pluginManager->GetPluginBasePath(plugin_name).c_str(), plugin->GetName().c_str());
 }
 
 PluginUserMessage scripting_GetUserMessage(std::string uuid)