Update

Author: TracerDS

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -746,6 +746,14 @@ void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisRe
             "Access denied");
 }
 
+std::pair<bool, SString> CheckCanModifyOtherResource(CResource* thisResource, CResource* otherResource)
+{
+    if (GetResourceModifyScope(thisResource, otherResource) != eResourceModifyScope::NONE)
+        return {true, ""};
+
+    return {false, SString("ModifyOtherObjects in ACL denied resource %s to access %s", thisResource->GetName().c_str(), otherResource->GetName().c_str())};
+}
+
 //
 // Set error if pThisResource does not have permission to modify every resource in resourceList
 //

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -402,8 +402,10 @@ enum class eResourceModifyScope
 };
 
 eResourceModifyScope GetResourceModifyScope(CResource* pThisResource, CResource* pOtherResource);
-void                 CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource);
-void                 CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisResource, std::initializer_list<CResource*> resourceList);
+void                     CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource);
+std::pair<bool, SString> CheckCanModifyOtherResource(CResource* thisResource, CResource* otherResource);
+
+void                     CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisResource, std::initializer_list<CResource*> resourceList);
 void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
                                      bool* pbReadOnly = nullptr);
 

Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp

@@ -248,7 +248,7 @@ std::variant<CDatabaseConnectionElement*, bool> CLuaDatabaseDefs::DbConnect(lua_
             if (!IsValidFilePath(host.c_str()))
             {
                 SString err("host path %s not valid", host.c_str());
-                throw LuaFunctionError(err.c_str());
+                throw LuaFunctionError(err.c_str(), false);
             }
 
             host = PathJoin(g_pGame->GetConfig()->GetGlobalDatabasesPath(), host);
@@ -259,15 +259,16 @@ std::variant<CDatabaseConnectionElement*, bool> CLuaDatabaseDefs::DbConnect(lua_
 
             // Parse path
             CResource* pathResource = resource;
-            if (CResourceManager::ParseResourcePathInput(host, pathResource, &absPath))
+            if (!CResourceManager::ParseResourcePathInput(host, pathResource, &absPath))
             {
-                host = absPath;
-                auto [status, err] = CheckCanModifyOtherResource(resource, pathResource);
-                if (!status)
-                    throw LuaFunctionError(err.c_str());
+                SString err("host path %s not found", host.c_str());
+                throw LuaFunctionError(err.c_str(), false);
             }
-            SString err("host path %s not found", host.c_str());
-            throw LuaFunctionError(err.c_str());
+
+            host = absPath;
+            auto [status, err] = CheckCanModifyOtherResource(resource, pathResource);
+            if (!status)
+                throw LuaFunctionError(err.c_str(), false);
         }
     }
 
@@ -338,7 +339,7 @@ std::variant<CDatabaseConnectionElement*, bool> CLuaDatabaseDefs::DbConnect(lua_
         type, host, *username, *password, *options
     );
     if (connection == INVALID_DB_HANDLE)
-        throw LuaFunctionError(g_pGame->GetDatabaseManager()->GetLastErrorMessage().c_str());
+        throw LuaFunctionError(g_pGame->GetDatabaseManager()->GetLastErrorMessage().c_str(), false);
 
     return CreateConnection(resource, connection);
 }

Shared/sdk/SharedUtil.Misc.h

@@ -745,12 +745,12 @@ namespace SharedUtil
 
         std::string Get(const char*& inCmd) const noexcept;
         bool        Get(const char*& inCmd, std::string& out, const char* defaultValue = "") const noexcept;
-        bool        Get(const char*& inCmd, std::vector<std::string>& outList) const noexcept;
+        bool        Get(const char*& inCmd, std::vector<std::string>& outList) const;
         bool        Get(const char*& inCmd, int& value, int defaultValue = 0) const noexcept;
 
         std::string Get(const std::string& inCmd) const noexcept;
         bool Get(const std::string& inCmd, std::string& out, const char* defaultValue = "") const noexcept;
-        bool Get(const std::string& inCmd, std::vector<std::string>& outList) const noexcept;
+        bool Get(const std::string& inCmd, std::vector<std::string>& outList) const;
         bool Get(const std::string& inCmd, int& value, int defaultValue = 0) const noexcept;
 
         bool    Get(const SString& strInCmd, SString& strOut, const char* szDefault = "") const;            // First result as string
@@ -873,7 +873,7 @@ namespace SharedUtil
         {
             std::string temp;
             GetOption<T>(text, key, temp);
-            numbers = temp;
+            numbers = std::move(temp);
         }
         std::vector<SString> numberList;
         numbers.Split(separator, numberList);

Shared/sdk/SharedUtil.Misc.hpp

@@ -1751,7 +1751,7 @@ namespace SharedUtil
         return Get(std::string(inCmd), out, defaultValue);
     }
 
-    bool CArgMap::Get(const char*& inCmd, std::vector<std::string>& outList) const noexcept
+    bool CArgMap::Get(const char*& inCmd, std::vector<std::string>& outList) const
     {
         return Get(std::string(inCmd), outList);
     }
@@ -1781,7 +1781,7 @@ namespace SharedUtil
         return false;
     }
 
-    bool CArgMap::Get(const std::string& inCmd, std::vector<std::string>& outList) const noexcept
+    bool CArgMap::Get(const std::string& inCmd, std::vector<std::string>& outList) const
     {
         std::vector<SString> newItems;
         MultiFind(m_Map, Escape(inCmd), &newItems);