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
@@ -24,7 +24,7 @@ void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHea

 bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
 {
-    if (!IsServer && m_NetworkEnabled) {
+    if (!IsServer && m_NetworkEnabled || !e.Victim.Valid()) {
        return false;
    }