Fixes for networking change in 762f460e23

2022-12-29 13:56:25 +01:00
parent 7184566b4b
commit c6bbfdc7f0
2 changed files with 14 additions and 1 deletions
--- a/Source/Engine/Networking/NetworkReplicator.cpp
+++ b/Source/Engine/Networking/NetworkReplicator.cpp
@@ -735,7 +735,20 @@ void NetworkReplicator::DespawnObject(ScriptingObject* obj)
    ScopeLock lock(ObjectsLock);
    const auto it = Objects.Find(obj->GetID());
    if (it == Objects.End())
+    {
+        // Special case if we're just spawning this object
+        for (int32 i = 0; i < SpawnQueue.Count(); i++)
+        {
+            auto& item = SpawnQueue[i];
+            if (item.Object == obj)
+            {
+                SpawnQueue.RemoveAt(i);
+                DeleteNetworkObject(obj);
+                break;
+            }
+        }
        return;
+    }
    auto& item = it->Item;
    if (item.Object != obj || !item.Spawned || item.OwnerClientId != NetworkManager::LocalClientId)
        return;