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

# Conflicts: # src/Game/Game.cpp
2016-03-02 15:59:16 +01:00
parent b2304a95f8 2fb3bb2a39
commit 3c8df35be9
195 changed files with 6820 additions and 2310 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;
    }