fix: entt crash

tiltedphoques · Apr 27, 2022 · cc4291c · cc4291c
1 parent 8604edf
commit cc4291c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -154,14 +154,16 @@ void CharacterService::OnActorRemoved(const ActorRemovedEvent& acEvent) noexcept
         return;
     }
 
-    auto& formIdComponent = m_world.get<FormIdComponent>(*entityIt);
+    const auto cId = *entityIt;
+
+    auto& formIdComponent = view.get<FormIdComponent>(cId);
     CancelServerAssignment(*entityIt, formIdComponent.Id);
 
-    if (m_world.all_of<FormIdComponent>(*entityIt))
-        m_world.remove<FormIdComponent>(*entityIt);
+    if (m_world.all_of<FormIdComponent>(cId))
+        m_world.remove<FormIdComponent>(cId);
 
-    if (m_world.orphan(*entityIt))
-        m_world.destroy(*entityIt);
+    if (m_world.orphan(cId))
+        m_world.destroy(cId);
 }
 
 void CharacterService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept