Merge remote-tracking branch 'origin/master' into 1.7

2023-08-18 10:33:51 +02:00
parent 1e3e75cb99 122524bd19
commit f088f2b61d
18 changed files with 324 additions and 124 deletions
--- a/Source/Engine/Networking/NetworkReplicator.cpp
+++ b/Source/Engine/Networking/NetworkReplicator.cpp
@@ -941,6 +941,13 @@ bool NetworkReplicator::HasObject(const ScriptingObject* obj)
    return false;
 }

+ScriptingObject* NetworkReplicator::ResolveForeignObject(Guid objectId)
+{
+    if (const auto& object = ResolveObject(objectId))
+        return object->Object.Get();
+    return nullptr;
+}
+
 uint32 NetworkReplicator::GetObjectOwnerClientId(const ScriptingObject* obj)
 {
    uint32 id = NetworkManager::ServerClientId;