Fixed positions in firstDamageStats always being the same

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.1.0</Version>
+        <Version>2.1.1</Version>
     </PropertyGroup>
 
     <PropertyGroup Label="Package Metadata">

src/SourceEngine.Demo.Stats/DemoProcessor.cs

@@ -612,7 +612,29 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool parse
 					md.addEvent(typeof(PlayerKilledEventArgs), playerKilledEventArgs);
 				}
 
-				var playerHurt = new PlayerHurt(e, round);
+				var player = new Player(e.Player);
+				var attacker = new Player(e.Attacker);
+
+				var playerHurt = new PlayerHurt()
+				{
+					Round = round,
+					TimeInRound = e.TimeInRound,
+					Player = player,
+					XPositionPlayer = player.Position.X,
+					YPositionPlayer = player.Position.Y,
+					ZPositionPlayer = player.Position.Z,
+					Attacker = attacker ?? null,
+					XPositionAttacker = (attacker != null && attacker.Position != null) ? attacker.Position.X : 0,
+					YPositionAttacker = (attacker != null && attacker.Position != null) ? attacker.Position.Y : 0,
+					ZPositionAttacker = (attacker != null && attacker.Position != null) ? attacker.Position.Z : 0,
+					Health = e.Health,
+					Armor = e.Armor,
+					Weapon = attacker != null ? e.Weapon : null,
+					HealthDamage = e.HealthDamage,
+					ArmorDamage = e.ArmorDamage,
+					Hitgroup = e.Hitgroup,
+					PossiblyKilledByBombExplosion = e.PossiblyKilledByBombExplosion,
+				};
 
 				md.addEvent(typeof(PlayerHurt), playerHurt);
 			};
@@ -1815,14 +1837,14 @@ public List<firstDamageStats> GetFirstDamageStats(ProcessedData processedData)
 							TimeInRound = firstDamage.TimeInRound,
 							TeamSideShooter = firstDamage.Attacker.Team.ToString(),
 							SteamIDShooter = firstDamage.Attacker.SteamID,
-							XPositionShooter = firstDamage.Attacker.Position.X,
-							YPositionShooter = firstDamage.Attacker.Position.Y,
-							ZPositionShooter = firstDamage.Attacker.Position.Z,
+							XPositionShooter = firstDamage.XPositionAttacker,
+							YPositionShooter = firstDamage.YPositionAttacker,
+							ZPositionShooter = firstDamage.ZPositionAttacker,
 							TeamSideVictim = firstDamage.Player.Team.ToString(),
 							SteamIDVictim = firstDamage.Player.SteamID,
-							XPositionVictim = firstDamage.Player.Position.X,
-							YPositionVictim = firstDamage.Player.Position.Y,
-							ZPositionVictim = firstDamage.Player.Position.Z,
+							XPositionVictim = firstDamage.XPositionPlayer,
+							YPositionVictim = firstDamage.YPositionPlayer,
+							ZPositionVictim = firstDamage.ZPositionPlayer,
 							Weapon = firstDamage.Weapon.Weapon.ToString(),
 							WeaponClass = firstDamage.Weapon.Class.ToString(),
 							WeaponType = firstDamage.Weapon.Type.ToString(),

src/SourceEngine.Demo.Stats/Models/PlayerHurt.cs

@@ -10,7 +10,13 @@ public class PlayerHurt
 		public int Round { get; set; }
 		public double TimeInRound { get; set; }
 		public Player Player { get; set; }
+		public double XPositionPlayer { get; set; }
+		public double YPositionPlayer { get; set; }
+		public double ZPositionPlayer { get; set; }
 		public Player Attacker { get; set; }
+		public double XPositionAttacker { get; set; }
+		public double YPositionAttacker { get; set; }
+		public double ZPositionAttacker { get; set; }
 		public int Health { get; set; }
 		public int Armor { get; set; }
 		public Equipment Weapon { get; set; }
@@ -20,20 +26,5 @@ public class PlayerHurt
 		public bool PossiblyKilledByBombExplosion { get; set; }
 
 		public PlayerHurt() { }
-
-		public PlayerHurt(PlayerHurtEventArgs playerHurtEventArgs, int round)
-		{
-			Round = round;
-			TimeInRound = playerHurtEventArgs.TimeInRound;
-			Player = new Player(playerHurtEventArgs.Player);
-			Attacker = new Player(playerHurtEventArgs.Attacker);
-			Health = playerHurtEventArgs.Health;
-			Armor = playerHurtEventArgs.Armor;
-			Weapon = new Equipment(playerHurtEventArgs.Weapon);
-			HealthDamage = playerHurtEventArgs.HealthDamage;
-			ArmorDamage = playerHurtEventArgs.ArmorDamage;
-			Hitgroup = playerHurtEventArgs.Hitgroup;
-			PossiblyKilledByBombExplosion = playerHurtEventArgs.PossiblyKilledByBombExplosion;
-		}
 	}
 }

tests/SourceEngine.Demo.Stats.Tests/Tests.cs

@@ -93,14 +93,14 @@ public void Should_return_first_shot_stats_stats_correctly()
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().TimeInRound.ShouldBe(40);
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().TeamSideShooter.ShouldBe("Terrorist");
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().SteamIDShooter.ShouldBe(32443298432);
-				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().XPositionShooter.ShouldBe(200);
-				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().YPositionShooter.ShouldBe(200);
-				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().ZPositionShooter.ShouldBe(200);
+				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().XPositionShooter.ShouldBe(0);
+				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().YPositionShooter.ShouldBe(0);
+				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().ZPositionShooter.ShouldBe(0);
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().TeamSideVictim.ShouldBe("CounterTerrorist");
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().SteamIDVictim.ShouldBe(12321313213);
-				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().XPositionVictim.ShouldBe(80);
-				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().YPositionVictim.ShouldBe(800);
-				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().ZPositionVictim.ShouldBe(8000);
+				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().XPositionVictim.ShouldBe(0);
+				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().YPositionVictim.ShouldBe(0);
+				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().ZPositionVictim.ShouldBe(0);
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().Weapon.ShouldBe("AK47");
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().WeaponClass.ShouldBe("Rifle");
 				allStats.firstDamageStats[0].FirstDamageToEnemyByPlayers.FirstOrDefault().WeaponType.ShouldBe("AssaultRifle");