update(src): v1.6.6 back

Author: skuzzis

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 Over here will be noted all the update change logs.
 
+## v1.6.6 - [Release](https://github.com/swiftly-solution/swiftly/releases/tag/v1.6.6)
+
+### Database
+
+- Add optional argument to skip connecting to `default_connection`
+
+### Crash Reporter
+
+- Add file location of the function from Call Stack
+
+### Utils
+
+- Added: GetPluginsList
+
+### Menus
+
+- Remove screen menus on windows as they crash without a dump
+
+### CCheckTransmitInfo
+
+- Fix self casting
+
+### Events
+
+- Fix event return values
+
+### SDK
+
+- Fix FollowServerRules check not working
+
 ## v1.6.5 - [Release](https://github.com/swiftly-solution/swiftly/releases/tag/v1.6.5)
 
 ### HTTP

src/core/entrypoint.cpp

@@ -243,7 +243,7 @@ bool OnClientCommand(int playerid, std::string command)
     bool response = true;
     try
     {
-        response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
+        response = std::any_cast<bool>(data.GetAnyData("event_return"));
     }
     catch (std::bad_any_cast& e)
     {

src/plugins/manager.cpp

@@ -214,7 +214,7 @@ EXT_API int swiftly_TriggerEvent(const char* ext_name, const char* evName, void*
 {
     ClassData data({ { "plugin_name", std::string(ext_name) } }, "Event", nullptr);
     auto result = g_pluginManager.ExecuteEvent(ext_name, evName, *(std::vector<std::any>*)args, &data);
-    *reinterpret_cast<std::any*>(eventReturn) = data.GetData<std::any>("event_return");
+    *reinterpret_cast<std::any*>(eventReturn) = data.GetAnyData("event_return");
 
     return (int)result;
 }

src/scripting/core.cpp

@@ -77,6 +77,17 @@ void SetupScriptingEnvironment(PluginObject plugin, EContext* ctx)
             arguments.push_back(context->GetArgumentAsString(i));
         function_call += "(" + implode(arguments, ", ") + ")";
 
+        if (context->GetPluginContext()->GetKind() == ContextKinds::Lua) {
+            lua_Debug ar;
+            lua_State* L = context->GetPluginContext()->GetLuaState();
+
+            if (lua_getstack(L, 1, &ar)) {
+                if (lua_getinfo(L, "Sl", &ar)) {
+                    function_call += string_format(" -> %s:%d", ar.short_src, ar.currentline);
+                }
+            }
+        }
+
         context->temporaryData.push_back(g_callStack.RegisterPluginCallstack(FetchPluginName(context->GetPluginContext()), function_call));
         g_ResourceMonitor.StartTime("core", replace(context->GetFunctionKey(), " ", "::"));
     });

src/scripting/engine/gameevents.cpp

@@ -32,7 +32,7 @@ bool OnClientChat(int playerid, std::string text, bool teamonly)
     bool response = true;
     try
     {
-        response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
+        response = std::any_cast<bool>(data.GetAnyData("event_return"));
     }
     catch (std::bad_any_cast& e)
     {
@@ -55,7 +55,7 @@ dyno::ReturnAction Hook_CGameRules_TerminateRound(dyno::CallbackType type, dyno:
     bool response = true;
     try
     {
-        response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
+        response = std::any_cast<bool>(data.GetAnyData("event_return"));
     }
     catch (std::bad_any_cast& e)
     {
@@ -81,7 +81,7 @@ dyno::ReturnAction Hook_CEntityIdentity_AcceptInput(dyno::CallbackType type, dyn
     bool response = true;
     try
     {
-        response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
+        response = std::any_cast<bool>(data.GetAnyData("event_return"));
     }
     catch (std::bad_any_cast& e)
     {
@@ -123,7 +123,7 @@ dyno::ReturnAction Hook_CBaseEntity_TakeDamage(dyno::CallbackType type, dyno::IH
     bool response = true;
     try
     {
-        response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
+        response = std::any_cast<bool>(data.GetAnyData("event_return"));
     }
     catch (std::bad_any_cast& e)
     {

src/scripting/network/database.cpp

@@ -36,17 +36,21 @@ LoadScriptingComponent(database, [](PluginObject plugin, EContext* ctx) -> void
 
     ADD_CLASS_FUNCTION("Database", "Database", [](FunctionContext* context, ClassData* data) -> void {
         std::string connection_name = context->GetArgumentOr<std::string>(0, "default_connection");
+        bool shouldSkipDefaultConnection = context->GetArgumentOr<bool>(1, false);
+
         auto db = g_dbManager.GetDatabase(connection_name);
         if (!db && connection_name != "default_connection") {
             PRINTF("Database connection \"%s\" doesn't exists inside the database configurations. Automatically falling back to \"default_connection\".\n", connection_name.c_str());
-            db = g_dbManager.GetDatabase("default_connection");
+            if (!shouldSkipDefaultConnection) db = g_dbManager.GetDatabase("default_connection");
         }
 
-        if (!db->Connect()) {
+        if (!db) {
+            PRINTF("An error has occured while trying to connect to database \"%s\":\nError: Invalid connection inside `addons/swiftly/configs/databases.json`\n", connection_name.c_str());
+        }
+        else if (!db->Connect()) {
             PRINTF("An error has occured while trying to connect to database \"%s\":\nError: %s\n", connection_name.c_str(), db->GetError().c_str());
         }
 
-        data->SetData("connection_name", connection_name);
         data->SetData("db", db);
     });
 

src/scripting/sdk/checktransmit.cpp

@@ -13,17 +13,24 @@ LoadScriptingComponent(checktransmit, [](PluginObject plugin, EContext* ctx) ->
 
     ADD_CLASS_FUNCTION("CCheckTransmitInfo", "CCheckTransmitInfo", [](FunctionContext* context, ClassData* data) -> void {
         auto classData = context->GetArgumentOr<ClassData*>(0, nullptr);
-        if(classData) {
-            if(classData->HasData("transmit_ptr")) {
+        if (classData) {
+            if (classData->HasData("class_ptr")) {
                 data->SetData("transmit_ptr", classData->GetData<void*>("class_ptr"));
-            } else if(classData->HasData("ptr")) {
+            }
+            else if (classData->HasData("ptr")) {
                 data->SetData("transmit_ptr", classData->GetData<void*>("ptr"));
-            } else data->SetData("transmit_ptr", (void*)nullptr);
-        } else {
+            }
+            else if (classData->HasData("transmit_ptr")) {
+                data->SetData("transmit_ptr", classData->GetData<void*>("transmit_ptr"));
+            }
+            else data->SetData("transmit_ptr", (void*)nullptr);
+        }
+        else {
             auto strptr = context->GetArgumentOr<std::string>(0, "");
-            if(starts_with(strptr, "0x")) {
+            if (starts_with(strptr, "0x")) {
                 data->SetData("transmit_ptr", (void*)StringToPtr(strptr));
-            } else data->SetData("transmit_ptr", (void*)nullptr);
+            }
+            else data->SetData("transmit_ptr", (void*)nullptr);
         }
     });
 
@@ -32,11 +39,11 @@ LoadScriptingComponent(checktransmit, [](PluginObject plugin, EContext* ctx) ->
 
         for (int i = 0; i < GetMaxGameClients(); i++) {
             CEntityInstance* controller = g_pEntitySystem->GetEntityInstance(CEntityIndex(i + 1));
-            if(!controller) continue;
+            if (!controller) continue;
 
             CHandle<CEntityInstance> pawnHandle = schema::GetProp<CHandle<CEntityInstance>>(controller, "CCSPlayerController", "m_hPlayerPawn");
             if (!pawnHandle) continue;
-    
+
             player_entindex.insert({ i, pawnHandle->m_pEntity->m_EHandle.GetEntryIndex() });
         }
 
@@ -50,7 +57,7 @@ LoadScriptingComponent(checktransmit, [](PluginObject plugin, EContext* ctx) ->
         for (int i = 0; i < MAX_EDICTS; i++)
             if (m_ptr->m_pTransmitEntity->IsBitSet(i))
                 entities_list.push_back(i);
-    
+
         context->SetReturn(entities_list);
     });
 
@@ -67,15 +74,15 @@ LoadScriptingComponent(checktransmit, [](PluginObject plugin, EContext* ctx) ->
         int entindex = context->GetArgumentOr<int>(0, 0);
         CCheckTransmitInfo* m_ptr = (CCheckTransmitInfo*)data->GetData<void*>("transmit_ptr");
 
-        if(!m_ptr->m_pTransmitEntity->IsBitSet(entindex))
+        if (!m_ptr->m_pTransmitEntity->IsBitSet(entindex))
             m_ptr->m_pTransmitEntity->Set(entindex);
     });
 
     ADD_CLASS_FUNCTION("CCheckTransmitInfo", "RemoveEntityIndex", [](FunctionContext* context, ClassData* data) -> void {
         int entindex = context->GetArgumentOr<int>(0, 0);
         CCheckTransmitInfo* m_ptr = (CCheckTransmitInfo*)data->GetData<void*>("transmit_ptr");
 
-        if(m_ptr->m_pTransmitEntity->IsBitSet(entindex))
+        if (m_ptr->m_pTransmitEntity->IsBitSet(entindex))
             m_ptr->m_pTransmitEntity->Clear(entindex);
     });