Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 020556d10559 · 2025-03-02T18:05:59.000Z
b99cb95 Revert "Fix `sourceResourceRoot` for client-sided events (#4021)" due to feedback about backwards compatibility.
diff --git a/Client/mods/deathmatch/logic/CMapEventManager.cpp b/Client/mods/deathmatch/logic/CMapEventManager.cpp
@@ -222,7 +222,7 @@ bool CMapEventManager::Call(const char* szName, const CLuaArguments& Arguments,
                         lua_pushresource(pState, pSourceResource);
                         lua_setglobal(pState, "sourceResource");
 
-                        lua_pushelement(pState, pSourceResource->GetResourceEntity());
+                        lua_pushelement(pState, pSourceResource->GetResourceDynamicEntity());
                         lua_setglobal(pState, "sourceResourceRoot");
                     }
                     else
@@ -400,4 +400,4 @@ void CMapEventManager::GetHandles(CLuaMain* pLuaMain, const char* szName, lua_St
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ bool CMapEventManager::Call(const char* szName, const CLuaArguments& Arguments,`
`222`	`222`	`lua_pushresource(pState, pSourceResource);`
`223`	`223`	`lua_setglobal(pState, "sourceResource");`
`224`	`224`
`225`		`- lua_pushelement(pState, pSourceResource->GetResourceEntity());`
	`225`	`+ lua_pushelement(pState, pSourceResource->GetResourceDynamicEntity());`
`226`	`226`	`lua_setglobal(pState, "sourceResourceRoot");`
`227`	`227`	`}`
`228`	`228`	`else`
`@@ -400,4 +400,4 @@ void CMapEventManager::GetHandles(CLuaMain* pLuaMain, const char* szName, lua_St`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`	`}`
`403`		`-}`
	`403`	`+}`