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
@@ -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());
 }