Merge remote-tracking branch 'origin/FixNetworkToPlayTest'

2016-02-12 09:18:32 +01:00
parent 47a365a8fc ba69c79821
commit 969e7cb0d5
6 changed files with 15 additions and 5 deletions
@@ -21,7 +21,7 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
    //if (e.Victim != LocalPlayer) {
    //    return false;
    //}
-    if (e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+    if (e.Victim.Valid() && e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
        return false;
    }

@@ -39,6 +39,7 @@ bool HealthSystem::OnInputCommand(Events::InputCommand& e)
 {
    if (e.Command == "TakeDamage" && e.Value > 0 && LocalPlayer.Valid()) {
        Events::PlayerDamage ev;
+        ev.Inflictor = LocalPlayer;
        ev.Victim = LocalPlayer;
        ev.Damage = e.Value;
        m_EventBroker->Publish(ev);