fix: health and death sync bug

tiltedphoques · Feb 22, 2022 · 126edee · 126edee
1 parent f7e41cd
commit 126edee
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/Code/client/Events/HealthChangeEvent.h b/Code/client/Events/HealthChangeEvent.h
@@ -6,7 +6,8 @@ struct HealthChangeEvent
 {
     HealthChangeEvent(uint32_t aHitteeId, float aDeltaHealth) 
         : HitteeId(aHitteeId), DeltaHealth(aDeltaHealth)
-    {}
+    {
+    }
 
     uint32_t HitteeId;
     float DeltaHealth;

diff --git a/Code/server/GameServer.cpp b/Code/server/GameServer.cpp
@@ -325,11 +325,12 @@ void GameServer::SendToLoaded(const ServerMessage& acServerMessage) const
     }
 }
 
-void GameServer::SendToPlayers(const ServerMessage& acServerMessage) const
+void GameServer::SendToPlayers(const ServerMessage& acServerMessage, const Player* apExcludeSender) const
 {
     for (auto pPlayer : m_pWorld->GetPlayerManager())
     {
-        pPlayer->Send(acServerMessage);
+        if (pPlayer != apExcludeSender)
+            pPlayer->Send(acServerMessage);
     }
 }
 

diff --git a/Code/server/GameServer.h b/Code/server/GameServer.h
@@ -54,7 +54,7 @@ struct GameServer final : Server
     void Send(ConnectionId_t aConnectionId, const ServerMessage& acServerMessage) const;
     void Send(ConnectionId_t aConnectionId, const ServerAdminMessage& acServerMessage) const;
     void SendToLoaded(const ServerMessage& acServerMessage) const;
-    void SendToPlayers(const ServerMessage& acServerMessage) const;
+    void SendToPlayers(const ServerMessage& acServerMessage, const Player* apExcludeSender = nullptr) const;
     void SendToPlayersInRange(const ServerMessage& acServerMessage, const entt::entity acOrigin) const;
 
     const Info& GetInfo() const noexcept

diff --git a/Code/server/Services/ActorValueService.cpp b/Code/server/Services/ActorValueService.cpp
@@ -46,8 +46,7 @@ void ActorValueService::OnActorValueChanges(const PacketEvent<RequestActorValueC
     notify.Id = acMessage.Packet.Id;
     notify.Values = acMessage.Packet.Values;
 
-    const entt::entity cEntity = static_cast<entt::entity>(message.Id);
-    GameServer::Get()->SendToPlayersInRange(notify, cEntity);
+    GameServer::Get()->SendToPlayers(notify, acMessage.pPlayer);
 }
 
 void ActorValueService::OnActorMaxValueChanges(const PacketEvent<RequestActorMaxValueChanges>& acMessage) const noexcept
@@ -74,8 +73,7 @@ void ActorValueService::OnActorMaxValueChanges(const PacketEvent<RequestActorMax
     notify.Id = message.Id;
     notify.Values = message.Values;
 
-    const entt::entity cEntity = static_cast<entt::entity>(message.Id);
-    GameServer::Get()->SendToPlayersInRange(notify, cEntity);
+    GameServer::Get()->SendToPlayers(notify, acMessage.pPlayer);
 }
 
 void ActorValueService::OnHealthChangeBroadcast(const PacketEvent<RequestHealthChangeBroadcast>& acMessage) const noexcept
@@ -86,8 +84,7 @@ void ActorValueService::OnHealthChangeBroadcast(const PacketEvent<RequestHealthC
     notify.Id = message.Id;
     notify.DeltaHealth = message.DeltaHealth;
 
-    const entt::entity cEntity = static_cast<entt::entity>(message.Id);
-    GameServer::Get()->SendToPlayersInRange(notify, cEntity);
+    GameServer::Get()->SendToPlayers(notify, acMessage.pPlayer);
 }
 
 void ActorValueService::OnDeathStateChange(const PacketEvent<RequestDeathStateChange>& acMessage) const noexcept
@@ -110,7 +107,6 @@ void ActorValueService::OnDeathStateChange(const PacketEvent<RequestDeathStateCh
     notify.Id = message.Id;
     notify.IsDead = message.IsDead;
 
-    const entt::entity cEntity = static_cast<entt::entity>(message.Id);
-    GameServer::Get()->SendToPlayersInRange(notify, cEntity);
+    GameServer::Get()->SendToPlayers(notify, acMessage.pPlayer);
 }