fix: actor stuck on traveling through door

tiltedphoques · May 28, 2022 · 6cd70c5 · 6cd70c5
1 parent 7222a5a
commit 6cd70c5
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -269,21 +269,24 @@ void CharacterService::OnAssignCharacter(const AssignCharacterResponse& acMessag
         return;
     }
 
+    auto* const pForm = TESForm::GetById(formIdComponent->Id);
+    auto* pActor = Cast<Actor>(pForm);
+    if (!pActor)
+    {
+        spdlog::error(__FUNCTION__ ": actor not found, form id: {:X}", formIdComponent->Id);
+        m_world.destroy(cEntity);
+        return;
+    }
+
     if (acMessage.Owner)
     {
         m_world.emplace<LocalComponent>(cEntity, acMessage.ServerId);
         m_world.emplace<LocalAnimationComponent>(cEntity);
+
+        pActor->GetExtension()->SetRemote(false);
     }
     else
     {
-        auto* const pForm = TESForm::GetById(formIdComponent->Id);
-        auto* pActor = Cast<Actor>(pForm);
-        if (!pActor)
-        {
-            m_world.destroy(cEntity);
-            return;
-        }
-
         m_world.emplace_or_replace<RemoteComponent>(cEntity, acMessage.ServerId, formIdComponent->Id);
 
         pActor->GetExtension()->SetRemote(true);