refactor: Refactor data structures for kill tracking +semver:patch

- Change `killedWithStation` data structure to `Dictionary` for enhanced player interaction tracking in `DamageStation.cs`
- Update `PoisonShotsListener.cs` to use `Dictionary` for poison kill tracking and adjust related logic
- Specify priority levels for event handlers in `GlovesListener.cs` to optimize execution order

TTT/CS2/CS2ServiceCollection.cs

@@ -84,7 +84,6 @@ public static class CS2ServiceCollection {
     // Commands
 #if DEBUG
     collection.AddModBehavior<TestCommand>();
-    collection.AddModBehavior<DebugMessage>();
 #endif
 
     collection.AddScoped<IGameManager, CS2GameManager>();

TTT/CS2/Command/Test/SpecCommand.cs

@@ -0,0 +1,41 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class SpecCommand(IServiceProvider provider) : ICommand {
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    var target = executor;
+
+    if (info.ArgCount == 2) {
+      var finder = provider.GetRequiredService<IPlayerFinder>();
+      var result = finder.GetPlayerByName(info.Args[1]);
+      if (result == null) {
+        info.ReplySync($"Player '{info.Args[1]}' not found.");
+        return Task.FromResult(CommandResult.ERROR);
+      }
+
+      target = result;
+    } else if (target == null) {
+      return Task.FromResult(CommandResult.PLAYER_ONLY);
+    }
+
+    var converter =
+      provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+    Server.NextWorldUpdate(() => {
+      var player = converter.GetPlayer(target);
+      player?.ChangeTeam(CsTeam.Spectator);
+      info.ReplySync($"{target.Name} has been moved to Spectators.");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/TestCommand.cs

@@ -26,6 +26,7 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
     subCommands.Add("sethealth", new SetHealthCommand());
     subCommands.Add("emitsound", new EmitSoundCommand(provider));
     subCommands.Add("credits", new CreditsCommand(provider));
+    subCommands.Add("spec", new SpecCommand(provider));
   }
 
   public Task<CommandResult>

TTT/CS2/GameHandlers/BodySpawner.cs

@@ -6,18 +6,17 @@ using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
 using TTT.CS2.Extensions;
 using TTT.Game.Events.Body;
-using TTT.Game.Events.Player;
-using TTT.Game.Listeners;
 using TTT.Game.Roles;
 
 namespace TTT.CS2.GameHandlers;
 
-public class BodySpawner(IServiceProvider provider) : BaseListener(provider) {
+public class BodySpawner(IServiceProvider provider) : IPluginModule {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
@@ -26,39 +25,31 @@ public class BodySpawner(IServiceProvider provider) : BaseListener(provider) {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
-  [UsedImplicitly]
-  [EventHandler]
-  public void OnLeave(PlayerLeaveEvent ev) {
-    if (games.ActiveGame is not { State: State.IN_PROGRESS }) return;
-    spawnRagdoll(ev.Player);
-  }
+  public void Dispose() { }
+  public void Start() { }
 
   [UsedImplicitly]
-  [EventHandler]
-  public void OnDeath(PlayerDeathEvent ev) {
-    if (games.ActiveGame is not { State: State.IN_PROGRESS }) return;
-    spawnRagdoll(ev.Player, ev.Killer, ev.Weapon);
-  }
-
-  private void spawnRagdoll(IPlayer apiPlayer, IOnlinePlayer? killer = null,
-    string? weapon = null) {
-    var player = converter.GetPlayer(apiPlayer);
-    if (player == null || !player.IsValid) return;
+  [GameEventHandler]
+  public HookResult OnDeath(EventPlayerDeath ev, GameEventInfo _) {
+    if (games.ActiveGame is not { State: State.IN_PROGRESS })
+      return HookResult.Continue;
+    var player = ev.Userid;
+    if (player == null || !player.IsValid) return HookResult.Continue;
     player.SetColor(Color.FromArgb(0, 255, 255, 255));
 
     var ragdollBody = makeGameRagdoll(player);
     var body        = new CS2Body(ragdollBody, converter.GetPlayer(player));
 
-    if (killer != null) body.WithKiller(killer);
+    if (ev.Attacker != null && ev.Attacker.IsValid)
+      body.WithKiller(converter.GetPlayer(ev.Attacker));
 
-    body.WithWeapon(new BaseWeapon(weapon ?? "unknown"));
+    body.WithWeapon(new BaseWeapon(ev.Weapon));
 
     var bodyCreatedEvent = new BodyCreateEvent(body);
     bus.Dispatch(bodyCreatedEvent);
 
-    if (bodyCreatedEvent.IsCanceled) {
-      ragdollBody.AcceptInput("Kill");
-    }
+    if (bodyCreatedEvent.IsCanceled) ragdollBody.AcceptInput("Kill");
+    return HookResult.Continue;
   }
 
   [UsedImplicitly]

TTT/CS2/GameHandlers/DebugMessage.cs

@@ -1,25 +0,0 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.UserMessages;
-using TTT.API;
-
-namespace TTT.CS2.GameHandlers;
-
-public class DebugMessage : IPluginModule {
-  public void Dispose() { }
-  public void Start() { }
-
-  public void Start(BasePlugin? plugin) {
-    for (var i = 0; i < 10000; i++) {
-      if (i is 325 or 124) continue;
-      var j = i;
-      plugin.HookUserMessage(i, msg => debug(msg, j));
-    }
-  }
-
-  private HookResult debug(UserMessage native, int id) {
-    Server.PrintToConsole(id + "");
-    Server.PrintToConsole(native.DebugString);
-    return HookResult.Continue;
-  }
-}

TTT/CS2/GameHandlers/LateSpawnListener.cs

@@ -1,19 +1,23 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
+using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
 
-namespace TTT.CS2.Listeners;
+namespace TTT.CS2.GameHandlers;
 
 public class LateSpawnListener(IServiceProvider provider)
   : BaseListener(provider) {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  [UsedImplicitly]
   [EventHandler]
   public void OnJoin(PlayerJoinEvent ev) {
     if (Games.ActiveGame is { State: State.IN_PROGRESS }) return;
@@ -24,4 +28,17 @@ public class LateSpawnListener(IServiceProvider provider)
       player.Respawn();
     });
   }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void GameState(GameStateUpdateEvent ev) {
+    if (ev.NewState == State.FINISHED) return;
+
+    Server.NextWorldUpdate(() => {
+      foreach (var player in Utilities.GetPlayers()
+       .Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE
+          && p.Team != CsTeam.Spectator && p.Team != CsTeam.None))
+        player.Respawn();
+    });
+  }
 }

TTT/CS2/GameHandlers/TeamChangeHandler.cs

@@ -65,10 +65,8 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
       return HookResult.Continue;
     var apiPlayer = converter.GetPlayer(ev.Userid);
 
-    Server.NextWorldUpdate(() => {
-      var playerDeath = new PlayerDeathEvent(apiPlayer);
-      bus.Dispatch(playerDeath);
-    });
+    var playerDeath = new PlayerDeathEvent(apiPlayer);
+    bus.Dispatch(playerDeath);
     return HookResult.Continue;
   }
 }

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -42,7 +42,8 @@ public class PoisonShotsListener(IServiceProvider provider)
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
-  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+  // private readonly ISet<string> killedWithPoison = new HashSet<string>();
+  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
 
   public override void Dispose() {
     base.Dispose();
@@ -118,7 +119,7 @@ public class PoisonShotsListener(IServiceProvider provider)
     if (dmgEvent.IsCanceled) return true;
 
     if (online.Health - config.PoisonConfig.DamagePerTick <= 0) {
-      killedWithPoison.Add(online.Id);
+      killedWithPoison[online.Id] = effect.Shooter;
       var deathEvent = new PlayerDeathEvent(online)
        .WithKiller(effect.Shooter as IOnlinePlayer)
        .WithWeapon($"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]");
@@ -167,8 +168,10 @@ public class PoisonShotsListener(IServiceProvider provider)
   [UsedImplicitly]
   [EventHandler]
   public void OnRagdollSpawn(BodyCreateEvent ev) {
-    if (!killedWithPoison.Contains(ev.Body.OfPlayer.Id)) return;
-    if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
-      ev.IsCanceled = true;
+    if (!killedWithPoison.TryGetValue(ev.Body.OfPlayer.Id, out var shooter))
+      return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = shooter as IOnlinePlayer;
   }
 }

TTT/CS2/Items/Station/DamageStation.cs

@@ -10,6 +10,7 @@ using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.CS2.Utils;
 using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
@@ -45,7 +46,9 @@ public class DamageStation(IServiceProvider provider)
   public override string Description
     => Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
 
-  private readonly ISet<string> killedWithStation = new HashSet<string>();
+  // private readonly ISet<string> killedWithStation = new HashSet<string>();
+  private Dictionary<string, StationInfo> killedWithStation =
+    new Dictionary<string, StationInfo>();
 
   override protected void onInterval() {
     var players  = finder.GetOnline();
@@ -87,7 +90,7 @@ public class DamageStation(IServiceProvider provider)
         damageAmount = -dmgEvent.DmgDealt;
 
         if (player.Health + damageAmount <= 0) {
-          killedWithStation.Add(player.Id);
+          killedWithStation[player.Id] = info;
           var playerDeath = new PlayerDeathEvent(player)
            .WithKiller(info.Owner as IOnlinePlayer)
            .WithWeapon($"[{Name}]");
@@ -115,8 +118,11 @@ public class DamageStation(IServiceProvider provider)
   [UsedImplicitly]
   [EventHandler]
   public void OnRagdollSpawn(BodyCreateEvent ev) {
-    if (!killedWithStation.Contains(ev.Body.OfPlayer.Id)) return;
-    if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
-      ev.IsCanceled = true;
+    if (!killedWithStation.TryGetValue(ev.Body.OfPlayer.Id,
+      out var stationInfo))
+      return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = stationInfo.Owner as IOnlinePlayer;
   }
 }

TTT/CS2/Utils/DamageDealingHelper.cs

@@ -0,0 +1,106 @@
+using System.Net;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
+
+namespace TTT.CS2.Utils;
+
+public class DamageDealingHelper {
+  public static void DealDamage(CCSPlayerController target,
+    CCSPlayerController? attacker, int damage, string source,
+    DamageTypes_t type = DamageTypes_t.DMG_BLAST_SURFACE) {
+    if (target.Pawn.Value == null) return;
+
+    var infoSize = Schema.GetClassSize("CTakeDamageInfo");
+    var infoPtr  = Marshal.AllocHGlobal(infoSize);
+
+    for (var i = 0; i < infoSize; i++) Marshal.WriteByte(infoPtr, i, 0);
+
+    var damageInfo = new CTakeDamageInfo(infoPtr);
+
+    // var attackerInfo = new CAttackerInfo() {
+    //   AttackerUserId =
+    //     attacker != null && attacker.UserId != null ?
+    //       (ushort)attacker.UserId :
+    //       unchecked((ushort)(-1)),
+    //   AttackerPawn = attacker != null ? attacker.Pawn.Raw : 0,
+    //   NeedInit     = false,
+    //   TeamNum =
+    //     attacker != null && attacker.Pawn.Value != null ?
+    //       attacker.Pawn.Value.TeamNum :
+    //       0,
+    //   TeamChecked = 0,
+    //   IsWorld     = attacker == null,
+    //   IsPawn      = attacker != null,
+    // };
+
+    // Marshal.StructureToPtr(attackerInfo, new IntPtr(infoPtr.ToInt64() + 0x80),
+    //   false);
+
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hInflictor",
+      attacker != null ? attacker.Pawn.Raw : 0);
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hAttacker",
+      attacker != null ? attacker.EntityHandle.Raw : 0);
+    damageInfo.Damage         = damage;
+    damageInfo.BitsDamageType = type;
+
+    if (target.Pawn.Value?.AbsOrigin != null)
+      Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
+        "m_vecDamagePosition",
+        target.Pawn.Value != null ?
+          target.Pawn.Value.AbsOrigin.Handle :
+          Vector.Zero.Handle);
+
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
+      "m_vecDamageForce", Vector.Zero.Handle);
+
+    var damageResultSize = Schema.GetClassSize("CTakeDamageResult");
+    var damageResultPtr  = Marshal.AllocHGlobal(damageResultSize);
+    for (var i = 0; i < damageResultSize; i++)
+      Marshal.WriteByte(damageResultPtr, i, 0);
+
+    var damageResult = new CTakeDamageResult(damageResultPtr);
+    Schema.SetSchemaValue(damageResult.Handle, "CTakeDamageResult",
+      "m_pOriginatingInfo", damageInfo.Handle);
+
+    damageResult.HealthLost          = damage;
+    damageResult.DamageDealt         = damage;
+    damageResult.TotalledHealthLost  = damage;
+    damageResult.TotalledDamageDealt = damage;
+    damageResult.WasDamageSuppressed = false;
+
+    if (target.EntityHandle.Value != null)
+      VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Invoke(
+        target.EntityHandle.Value, damageInfo, damageResult);
+
+    Marshal.FreeHGlobal(infoPtr);
+    Marshal.FreeHGlobal(damageResultPtr);
+  }
+}
+
+[StructLayout(LayoutKind.Explicit)]
+public struct CAttackerInfo {
+  [FieldOffset(0x0)]
+  public bool NeedInit;
+
+  [FieldOffset(0x1)]
+  public bool IsPawn;
+
+  [FieldOffset(0x2)]
+  public bool IsWorld;
+
+  [FieldOffset(0x4)]
+  public UInt32 AttackerPawn;
+
+  [FieldOffset(0x8)]
+  public ushort AttackerUserId;
+
+  [FieldOffset(0x0C)]
+  public int TeamChecked;
+
+  [FieldOffset(0x10)]
+  public int TeamNum;
+}

TTT/Shop/Items/Traitor/Gloves/GlovesListener.cs

@@ -24,7 +24,7 @@ public class GlovesListener(IServiceProvider provider)
   private readonly Dictionary<IPlayer, int> uses = new();
 
   [UsedImplicitly]
-  [EventHandler]
+  [EventHandler(Priority = Priority.LOW)]
   public void BodyCreate(BodyCreateEvent ev) {
     if (ev.Body.Killer == null || !useGloves(ev.Body.Killer)) return;
     if (ev.Body.Killer is not IOnlinePlayer online) return;