Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

# Conflicts: # src/Engine/Network/Client.cpp
2016-02-22 10:19:48 +01:00
parent a1e932d261 bac23f6e8c
commit c7d31cac2d
2 changed files with 2 additions and 2 deletions
@@ -488,7 +488,7 @@ void Client::parsePlayerDamage(Packet& packet)
    Events::PlayerDamage e;
    PlayerID victimID = packet.ReadPrimitive<EntityID>();
    PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
-    if (!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)) {
+    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
        return;
    }
    e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));