Enabled server broadcasting PlayerDamage events to other players to make damage indicators work

include/Engine/Network/Client.h

@@ -109,7 +109,7 @@ public:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-
+    void parsePlayerDamage(Packet& packet);
 private:
     UDPClient m_Unreliable;
     TCPClient m_Reliable;

include/Engine/Network/Server.h

@@ -81,6 +81,7 @@ private:
     void parseUDPConnect(Packet & packet);
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();
+    bool shouldSendToClient(EntityWrapper childEntity);
 
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
@@ -91,7 +92,8 @@ private:
     bool OnEntityDeleted(const Events::EntityDeleted& e);
     EventRelay<Server, Events::ComponentDeleted> m_EComponentDeleted;
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
-    bool shouldSendToClient(EntityWrapper childEntity);
+    EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(const Events::PlayerDamage& e);
 };
 
 #endif

src/Engine/Network/Client.cpp

@@ -119,6 +119,9 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::ComponentDeleted:
         parseComponentDeletion(packet);
         break;
+    case MessageType::OnPlayerDamage:
+        parsePlayerDamage(packet);
+        break;
     default:
         break;
     }
@@ -409,12 +412,17 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
 bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
 {
+    if (e.Inflictor != m_LocalPlayer) {
+        return false;
+    }
+
     Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
     packet.WritePrimitive(m_ClientIDToServerID.at(e.Inflictor.ID));
     packet.WritePrimitive(m_ClientIDToServerID.at(e.Victim.ID));
     packet.WritePrimitive(e.Damage);
     m_Reliable.Send(packet);
-    return false;
+
+    return true;
 }
 
 bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
@@ -425,6 +433,18 @@ bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
     return true;
 }
 
+void Client::parsePlayerDamage(Packet& packet)
+{
+    Events::PlayerDamage e;
+    e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
+    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
+    e.Damage = packet.ReadPrimitive<double>();
+    // Don't rebroadcast our own player damage events or we'll have an infinite loop!
+    if (e.Inflictor != m_LocalPlayer) {
+        m_EventBroker->Publish(e);
+    }
+}
+
 void Client::sendLocalPlayerTransform()
 {
     if (!m_LocalPlayer.Valid()) {

src/Engine/Network/Server.cpp

@@ -11,6 +11,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Server::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &Server::OnEntityDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
 
     // Bind
     if (port == 0) {
@@ -411,12 +412,22 @@ bool Server::OnComponentDeleted(const Events::ComponentDeleted & e)
             Packet packet = Packet(MessageType::ComponentDeleted);
             packet.WritePrimitive<EntityID>(e.Entity);
             packet.WriteString(e.ComponentType);
-        reliableBroadcast(packet);
+            reliableBroadcast(packet);
         }
     }
     return false;
 }
 
+bool Server::OnPlayerDamage(const Events::PlayerDamage& e)
+{
+    Packet packet(MessageType::OnPlayerDamage);
+    packet.WritePrimitive(e.Inflictor.ID);
+    packet.WritePrimitive(e.Victim.ID);
+    packet.WritePrimitive(e.Damage);
+    reliableBroadcast(packet);
+
+    return false;
+}
 
 void Server::parseClientPing()
 {

src/Game/Systems/DamageIndicatorSystem.cpp

@@ -18,7 +18,10 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
         return false;
     }
 
-    if (e.Victim != LocalPlayer) {
+    //if (e.Victim != LocalPlayer) {
+    //    return false;
+    //}
+    if (e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
         return false;
     }
 

src/Game/Systems/HealthSystem.cpp

@@ -23,6 +23,10 @@ void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHea
 
 bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
 {
+    if (!IsServer) {
+        return false;
+    }
+
     ComponentWrapper cHealth = e.Victim["Health"];
     double& health = cHealth["Health"];
     health -= e.Damage;