Merge remote-tracking branch 'origin/master' into Networking

src/Engine/Network/Client.cpp

@@ -299,7 +299,6 @@ bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
     Packet packet(MessageType::OnInputCommand, m_SendPacketID);
     packet.WritePrimitive(e.DamageAmount);
     packet.WritePrimitive(e.PlayerDamagedID);
-    packet.WriteString(e.TypeOfDamage);
     send(packet);
     return false;
 }

src/Engine/Network/Server.cpp

@@ -259,7 +259,6 @@ void Server::parseOnPlayerDamage(Packet & packet)
     Events::PlayerDamage e;
     e.DamageAmount = packet.ReadPrimitive<double>();
     e.PlayerDamagedID = packet.ReadPrimitive<EntityID>();
-    e.TypeOfDamage = packet.ReadString();
     m_EventBroker->Publish(e);
     //LOG_DEBUG("Server::parseOnPlayerDamage: Command is %s. Value is %f. PlayerID is %i.", e.DamageAmount, e.PlayerDamagedID, e.TypeOfDamage.c_str());
 }