Fixed deaths with no killer being skipped + Fixed deaths by bomb explosion being missed (they don't trigger the player_death event) + Fixed unknown 'weapons' such as trigger_hurt showing Pistol as their Class

Author: JimmyWoodhouse

Directory.Build.props

@@ -15,7 +15,7 @@
         <Company>Source Engine Discord</Company>
         <Copyright>© 2014 EHVAG, 2020 Source Engine Discord and contributors</Copyright>
         <Product>SourceEngine.Demo</Product>
-        <Version>2.0.8</Version>
+        <Version>2.0.9</Version>
     </PropertyGroup>
 
     <PropertyGroup Label="Package Metadata">

src/SourceEngine.Demo.Parser/DP/Handler/GameEventHandler.cs

@@ -273,13 +273,13 @@ public static void Apply(GameEvent rawEvent, DemoParser parser, bool parseChicke
                     kill.TeamKill = false;
                     kill.Suicide = false;
 
-					if (kill.Victim != null && kill.Killer != null)
+					if (kill.Victim != null)
 					{
-						if (kill.Victim.SteamID != 0 && kill.Victim.SteamID == kill.Killer.SteamID)
+						if (kill.Victim.SteamID != 0 && kill.Victim.SteamID == kill.Killer?.SteamID)
 						{
 							kill.Suicide = true;
 						}
-						else if (kill.Victim.Team == kill.Killer.Team)
+						else if (kill.Killer != null && kill.Victim.Team == kill.Killer.Team)
 						{
 							kill.TeamKill = true;
 						}
@@ -334,11 +334,20 @@ public static void Apply(GameEvent rawEvent, DemoParser parser, bool parseChicke
 
 				    hurt.Weapon = new Equipment ((string)data ["weapon"], "");
 
-				    if (hurt.Attacker != null && hurt.Weapon.Class != EquipmentClass.Grenade && hurt.Attacker.Weapons.Any ()) {
+					if (hurt.Attacker != null && hurt.Weapon.Class != EquipmentClass.Grenade && hurt.Attacker.Weapons.Any ()) {
 					    hurt.Weapon = hurt.Attacker.ActiveWeapon;
-				    }
+					}
+
+					hurt.TimeInRound = parser.CurrentTime - timestampFreezetimeEnded;
+
+					hurt.PossiblyKilledByBombExplosion = (hurt.Health == 0 &&
+														  string.IsNullOrWhiteSpace(hurt.Weapon.OriginalString) &&
+														  hurt.Weapon.Weapon == EquipmentElement.Unknown &&
+														  hurt.Weapon.Class == EquipmentClass.Unknown)
+															  ? true
+															  : false;
 
-				    parser.RaisePlayerHurt (hurt);
+				    parser.RaisePlayerHurt(hurt);
 				    break;
 
 				    #region Nades

src/SourceEngine.Demo.Parser/Events.cs

@@ -282,6 +282,11 @@ public class HostagePickedUpEventArgs : EventArgs
 
     public class PlayerHurtEventArgs : EventArgs
 	{
+		/// <summary>
+		/// The time in the round the event has occurred
+		/// </summary>
+		public double TimeInRound { get; set; }
+
 		/// <summary>
 		/// The hurt player
 		/// </summary>
@@ -335,6 +340,12 @@ public class PlayerHurtEventArgs : EventArgs
 		/// </summary>
 		/// <value>The hitgroup.</value>
 		public Hitgroup Hitgroup { get; set; }
+
+		/// <summary>
+		/// Shows if it is possible that the player was killed by a bomb explosion (player_death is not triggered when it is due to the bomb (unsure if this is always or just sometimes)). 
+		/// </summary>
+		/// <value>The hitgroup.</value>
+		public bool PossiblyKilledByBombExplosion { get; set; }
 	}
 
 	public class BlindEventArgs : EventArgs
@@ -723,7 +734,7 @@ public static EquipmentElement MapEquipment(string OriginalString)
 
 	public enum EquipmentElement
 	{
-		Unknown = 0,
+		Unknown = -100,
 
 		//Pistols
 		P2000 = 1,

src/SourceEngine.Demo.Stats/DemoProcessor.cs

@@ -587,6 +587,32 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool parse
                 md.addEvent(typeof(PlayerKilledEventArgs), e);
             };
 
+            dp.PlayerHurt += (object sender, PlayerHurtEventArgs e) => { // only interested in player_hurt events when it is possible that a player_death event is not triggered due to death by bomb explosion
+				if (e.PossiblyKilledByBombExplosion)
+				{
+					var round = GetCurrentRoundNum(md);
+
+					var playerKilledEventArgs = new PlayerKilledEventArgs()
+					{
+						Round = round,
+						TimeInRound = e.TimeInRound,
+						Killer = e.Attacker,
+						KillerBotTakeover = false, // ?
+						Victim = e.Player,
+						VictimBotTakeover = false, // ?
+						Assister = null,
+						AssisterBotTakeover = false, // ?
+						Suicide = false,
+						TeamKill = false,
+						PenetratedObjects = 0,
+						Headshot = false,
+						AssistedFlash = false,
+					};
+
+					md.addEvent(typeof(PlayerKilledEventArgs), playerKilledEventArgs);
+				}
+            };
+
             dp.RoundMVP += (object sender, RoundMVPEventArgs e) => {
                 md.addEvent(typeof(RoundMVPEventArgs), e);
             };
@@ -1791,7 +1817,7 @@ public List<playerPositionsStats> GetPlayerPositionsStats(ProcessedData processe
 						foreach (var playerPositionsInstance in steamIdsGroup)
 						{
 							// skip players who have died this round
-							if (!processedData.PlayerKilledEventsValues.Any(x => x.Round == playerPositionsStat.Round && x.Victim.SteamID == playerPositionsInstance.SteamID && x.TimeInRound <= playerPositionByTimeInRound.TimeInRound ))
+							if (!processedData.PlayerKilledEventsValues.Any(x => x.Round == playerPositionsStat.Round && (x.Victim?.SteamID != 0 && x.Victim.SteamID == playerPositionsInstance.SteamID) && x.TimeInRound <= playerPositionByTimeInRound.TimeInRound ))
 							{
 								playerPositionByTimeInRound.PlayerPositionBySteamID.Add(new PlayerPositionBySteamID()
 								{
@@ -1953,7 +1979,7 @@ public static bool CheckIfPlayerAliveAtThisPointInRound(MatchData md, Player pla
 
 			var kills = md.events.Where(k => k.Key.Name.ToString() == "PlayerKilledEventArgs").Select(v => (PlayerKilledEventArgs)v.Value.ElementAt(0));
 
-			return !kills.Any(x => x.Round == round && x.Victim.SteamID == player.SteamID);
+			return !kills.Any(x => x.Round == round && (x.Victim?.SteamID != 0 && x.Victim.SteamID == player?.SteamID));
 		}
 
         public int CheckForUpdatedUserId(int userId)