Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit f1f98ed4b22a · 2025-08-24T15:46:07.000Z
2d42a42 Set hasObjectPermissionTo defaultPermission to false (#4388) ffcde8e Update client en_US pot
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp
@@ -888,7 +888,7 @@ int CLuaACLDefs::aclGroupRemoveObject(lua_State* luaVM)
 
 int CLuaACLDefs::hasObjectPermissionTo(lua_State* luaVM)
 {
-    //  bool hasObjectPermissionTo ( string / element theObject, string theAction [, bool defaultPermission = true ] )
+    //  bool hasObjectPermissionTo ( string / element theObject, string theAction [, bool defaultPermission = false ] )
     CResource*                                 pResource = NULL;
     CElement*                                  pElement = NULL;
     SString                                    strObject;
@@ -905,7 +905,7 @@ int CLuaACLDefs::hasObjectPermissionTo(lua_State* luaVM)
         argStream.ReadString(strObject);
 
     argStream.ReadString(strRightName);
-    argStream.ReadBool(bDefault, true);
+    argStream.ReadBool(bDefault, false);
 
     if (!argStream.HasErrors())
     {

Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,7 @@ int CLuaACLDefs::aclGroupRemoveObject(lua_State* luaVM)`
`888`	`888`
`889`	`889`	`int CLuaACLDefs::hasObjectPermissionTo(lua_State* luaVM)`
`890`	`890`	`{`
`891`		`- // bool hasObjectPermissionTo ( string / element theObject, string theAction [, bool defaultPermission = true ] )`
	`891`	`+ // bool hasObjectPermissionTo ( string / element theObject, string theAction [, bool defaultPermission = false ] )`
`892`	`892`	`CResource* pResource = NULL;`
`893`	`893`	`CElement* pElement = NULL;`
`894`	`894`	`SString strObject;`
`@@ -905,7 +905,7 @@ int CLuaACLDefs::hasObjectPermissionTo(lua_State* luaVM)`
`905`	`905`	`argStream.ReadString(strObject);`
`906`	`906`
`907`	`907`	`argStream.ReadString(strRightName);`
`908`		`- argStream.ReadBool(bDefault, true);`
	`908`	`+ argStream.ReadBool(bDefault, false);`
`909`	`909`
`910`	`910`	`if (!argStream.HasErrors())`
`911`	`911`	`{`