fix: update health server side

tiltedphoques · May 11, 2022 · f49753e · Force67 · May 11, 2022 · RobbeBryssinck
1 parent 31ffbf5
commit f49753e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -284,12 +284,6 @@ void CharacterService::OnAssignCharacter(const AssignCharacterResponse& acMessag
             return;
         }
 
-        const auto* pNpc = Cast<TESNPC>(pActor->baseForm);
-        if (pNpc)
-        {
-            spdlog::warn("Spawn Actor: {:X}, and NPC {}", pActor->formID, pNpc->fullName.value);
-        }
-
         m_world.emplace_or_replace<RemoteComponent>(cEntity, acMessage.ServerId, formIdComponent->Id);
 
         pActor->GetExtension()->SetRemote(true);

diff --git a/Code/server/Services/ActorValueService.cpp b/Code/server/Services/ActorValueService.cpp
@@ -75,6 +75,16 @@ void ActorValueService::OnHealthChangeBroadcast(const PacketEvent<RequestHealthC
     auto& message = acMessage.Packet;
 
     // TODO(cosideci): should server side health not be updated?
+    auto actorValuesView = m_world.view<ActorValuesComponent, OwnerComponent>();
+
+    auto it = actorValuesView.find(static_cast<entt::entity>(message.Id));
+
+    if (it != actorValuesView.end())
+    {
+        auto& actorValuesComponent = actorValuesView.get<ActorValuesComponent>(*it);
+        auto currentHealth = actorValuesComponent.CurrentActorValues.ActorValuesList[24];
+        actorValuesComponent.CurrentActorValues.ActorValuesList[24] = currentHealth - message.DeltaHealth;
+    }
 
     NotifyHealthChangeBroadcast notify;
     notify.Id = message.Id;