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

2016-01-22 10:36:11 +01:00
parent 6cd073c3c8 8cf83454d7
commit 7a95880e10
126 changed files with 4577 additions and 1964 deletions
@@ -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;
 }