From 95b2259eb4d7362b137d26037f8312b3d80f0244 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Sat, 29 Jul 2023 02:55:08 +0100 Subject: Add fall damage --- code/phase/PlayPhase.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'code/phase/PlayPhase.cs') diff --git a/code/phase/PlayPhase.cs b/code/phase/PlayPhase.cs index b6210b3..8b4ff7f 100644 --- a/code/phase/PlayPhase.cs +++ b/code/phase/PlayPhase.cs @@ -98,18 +98,24 @@ public class PlayPhase : BasePhase [MurderEvent.Kill] public void OnKill(Entity killer, Entity victim) { - if (killer == null || killer is not Player || victim == null || victim is not Player ) + if (killer is not Player && victim is not Player ) { return; } Player victimPlayer = (Player)victim; - Player killerPlayer = (Player)killer; - Team victimTeam = victimPlayer.CurrentTeam; - Team killerTeam = killerPlayer.CurrentTeam; - victimPlayer.CurrentTeam = Team.Spectator; + if (killer == null) + { + Log.Info( victimPlayer + " died mysteriously" ); + return; + } + + + Player killerPlayer = (Player)killer; + Team killerTeam = killerPlayer.CurrentTeam; + Log.Info( victimPlayer + " died to " + killerPlayer ); if (victimTeam != Team.Murderer && killerTeam != Team.Murderer) -- cgit v1.2.3-70-g09d2