Remove thrower record class

qualterz · May 13, 2024 · fabec1f · fabec1f
1 parent 5ae6ed2
commit fabec1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/CS2Nades.Common/NadesHandler.cs b/CS2Nades.Common/NadesHandler.cs
@@ -55,10 +55,9 @@ public NadesHandler(DemoParser demoParser)
             var expireTiming = new Timing(demoParser.CurrentGameTick, demoParser.CurrentGameTime);
             var timings = new Timings(throwTiming!, expireTiming);
             var throwerId = e.Thrower?.Controller?.SteamID;
-            var thrower = new Thrower(throwerId ?? default);
 
             OnThrownNade?.Invoke(new(
-                Thrower: thrower,
+                ThrowerId: throwerId ?? default,
                 Timings: timings,
                 Nade: nade));
         };
@@ -69,5 +68,4 @@ public record ThrowLineup(Vector Position, QAngle Angle, InputButtons Buttons);
 public record Nade(string Name, ThrowLineup Lineup, Vector Destination);
 public record Timing(GameTick Tick, GameTime Time);
 public record Timings(Timing Throw, Timing Expire);
-public record Thrower(ulong SteamId);
-public record ThrownNade(Nade Nade, Thrower Thrower, Timings Timings);
+public record ThrownNade(Nade Nade, Timings Timings, ulong ThrowerId);
diff --git a/CS2Nades.Console/Program.cs b/CS2Nades.Console/Program.cs
@@ -31,7 +31,7 @@
 
 nadesHandler.OnThrownNade += thrownNade =>
 {
-    var player = demoParser.GetPlayerBySteamId(thrownNade.Thrower.SteamId);
+    var player = demoParser.GetPlayerBySteamId(thrownNade.ThrowerId);
     var nickname = player?.PlayerName;
     var place = player?.PlayerPawn?.LastPlaceName;
 
@@ -40,7 +40,7 @@
         Nade = thrownNade.Nade,
         Thrower = new
         {
-            SteamId = thrownNade.Thrower.SteamId,
+            SteamId = thrownNade.ThrowerId,
             Nickname = nickname,
         },
         ThrowPlace = place,