Add safety checks to avoid stuck states

Bumps
[actions/upload-artifact](https://github.com/actions/upload-artifact)
from 4 to 5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/upload-artifact/releases">actions/upload-artifact's
releases</a>.</em></p>
<blockquote>
<h2>v5.0.0</h2>
<h2>What's Changed</h2>
<p><strong>BREAKING CHANGE:</strong> this update supports Node
<code>v24.x</code>. This is not a breaking change per-se but we're
treating it as such.</p>
<ul>
<li>Update README.md by <a
href="https://github.com/GhadimiR"><code>@​GhadimiR</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/681">actions/upload-artifact#681</a></li>
<li>Update README.md by <a
href="https://github.com/nebuk89"><code>@​nebuk89</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/712">actions/upload-artifact#712</a></li>
<li>Readme: spell out the first use of GHES by <a
href="https://github.com/danwkennedy"><code>@​danwkennedy</code></a> in
<a
href="https://redirect.github.com/actions/upload-artifact/pull/727">actions/upload-artifact#727</a></li>
<li>Update GHES guidance to include reference to Node 20 version by <a
href="https://github.com/patrikpolyak"><code>@​patrikpolyak</code></a>
in <a
href="https://redirect.github.com/actions/upload-artifact/pull/725">actions/upload-artifact#725</a></li>
<li>Bump <code>@actions/artifact</code> to <code>v4.0.0</code></li>
<li>Prepare <code>v5.0.0</code> by <a
href="https://github.com/danwkennedy"><code>@​danwkennedy</code></a> in
<a
href="https://redirect.github.com/actions/upload-artifact/pull/734">actions/upload-artifact#734</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/GhadimiR"><code>@​GhadimiR</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/upload-artifact/pull/681">actions/upload-artifact#681</a></li>
<li><a href="https://github.com/nebuk89"><code>@​nebuk89</code></a> made
their first contribution in <a
href="https://redirect.github.com/actions/upload-artifact/pull/712">actions/upload-artifact#712</a></li>
<li><a
href="https://github.com/danwkennedy"><code>@​danwkennedy</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/upload-artifact/pull/727">actions/upload-artifact#727</a></li>
<li><a
href="https://github.com/patrikpolyak"><code>@​patrikpolyak</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/upload-artifact/pull/725">actions/upload-artifact#725</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v5.0.0">https://github.com/actions/upload-artifact/compare/v4...v5.0.0</a></p>
<h2>v4.6.2</h2>
<h2>What's Changed</h2>
<ul>
<li>Update to use artifact 2.3.2 package &amp; prepare for new
upload-artifact release by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/685">actions/upload-artifact#685</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/upload-artifact/pull/685">actions/upload-artifact#685</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v4.6.2">https://github.com/actions/upload-artifact/compare/v4...v4.6.2</a></p>
<h2>v4.6.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Update to use artifact 2.2.2 package by <a
href="https://github.com/yacaovsnc"><code>@​yacaovsnc</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/673">actions/upload-artifact#673</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v4.6.1">https://github.com/actions/upload-artifact/compare/v4...v4.6.1</a></p>
<h2>v4.6.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Expose env vars to control concurrency and timeout by <a
href="https://github.com/yacaovsnc"><code>@​yacaovsnc</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/662">actions/upload-artifact#662</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v4.6.0">https://github.com/actions/upload-artifact/compare/v4...v4.6.0</a></p>
<h2>v4.5.0</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: deprecated <code>Node.js</code> version in action by <a
href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/578">actions/upload-artifact#578</a></li>
<li>Add new <code>artifact-digest</code> output by <a
href="https://github.com/bdehamer"><code>@​bdehamer</code></a> in <a
href="https://redirect.github.com/actions/upload-artifact/pull/656">actions/upload-artifact#656</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a> made
their first contribution in <a
href="https://redirect.github.com/actions/upload-artifact/pull/578">actions/upload-artifact#578</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="330a01c490"><code>330a01c</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/upload-artifact/issues/734">#734</a>
from actions/danwkennedy/prepare-5.0.0</li>
<li><a
href="03f2824452"><code>03f2824</code></a>
Update <code>github.dep.yml</code></li>
<li><a
href="905a1ecb59"><code>905a1ec</code></a>
Prepare <code>v5.0.0</code></li>
<li><a
href="2d9f9cdfa9"><code>2d9f9cd</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/upload-artifact/issues/725">#725</a>
from patrikpolyak/patch-1</li>
<li><a
href="9687587dec"><code>9687587</code></a>
Merge branch 'main' into patch-1</li>
<li><a
href="2848b2cda0"><code>2848b2c</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/upload-artifact/issues/727">#727</a>
from danwkennedy/patch-1</li>
<li><a
href="9b511775fd"><code>9b51177</code></a>
Spell out the first use of GHES</li>
<li><a
href="cd231ca1ed"><code>cd231ca</code></a>
Update GHES guidance to include reference to Node 20 version</li>
<li><a
href="de65e23aa2"><code>de65e23</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/upload-artifact/issues/712">#712</a>
from actions/nebuk89-patch-1</li>
<li><a
href="8747d8cd76"><code>8747d8c</code></a>
Update README.md</li>
<li>Additional commits viewable in <a
href="https://github.com/actions/upload-artifact/compare/v4...v5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/upload-artifact&package-manager=github_actions&previous-version=4&new-version=5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

.github/workflows/dotnet.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Publish Test Project
         run: dotnet publish TTT/Test/Test.csproj --no-restore --no-build -o build_output -c Debug
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: build_output
           path: build_output
@@ -59,7 +59,7 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Download Build Output
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: build_output
           path: build_output

TTT/CS2/CS2ServiceCollection.cs

@@ -67,6 +67,8 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<TeamChangeHandler>();
     collection.AddModBehavior<TraitorChatHandler>();
     collection.AddModBehavior<PlayerMuter>();
+    collection.AddModBehavior<MapChangeCausesEndListener>();
+    collection.AddModBehavior<EntityTargetHandlers>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();

TTT/CS2/Command/Test/SetTargetCommand.cs

@@ -0,0 +1,37 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class SetTargetCommand(IServiceProvider provider) : ICommand {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public string Id => "settarget";
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+
+    Server.NextWorldUpdate(() => {
+      var gamePlayer = converter.GetPlayer(executor);
+      if (gamePlayer == null) return;
+
+      info.ReplySync("Target: " + gamePlayer.Target);
+      gamePlayer.Target = "TRAITOR";
+      info.ReplySync("New Target: " + gamePlayer.Target);
+      if (gamePlayer.Pawn.Value != null)
+        gamePlayer.Pawn.Value.Globalname = "TRAITOR";
+      info.ReplySync("New Globalname: " + gamePlayer.Pawn.Value?.Globalname);
+      gamePlayer.AcceptInput("targetname", null, null, "TRAITOR");
+      gamePlayer.AddEntityIOEvent("targetname", null, null, "TRAITOR");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/TestCommand.cs

@@ -29,6 +29,7 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
     subCommands.Add("spec", new SpecCommand(provider));
     subCommands.Add("reload", new ReloadModuleCommand(provider));
     subCommands.Add("specialround", new SpecialRoundCommand(provider));
+    subCommands.Add("settarget", new SetTargetCommand(provider));
   }
 
   public Task<CommandResult>

TTT/CS2/Configs/CS2GameConfig.cs

@@ -24,7 +24,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
 
   public static readonly FakeConVar<int> CV_ROUND_DURATION_PER_PLAYER = new(
     "css_ttt_round_duration_per_player",
-    "Additional round duration per player in seconds", 10,
+    "Additional round duration per player in seconds", 15,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 60));
 
   public static readonly FakeConVar<int> CV_ROUND_DURATION_MAX = new(

TTT/CS2/Configs/CS2ShopConfig.cs

@@ -10,7 +10,7 @@ namespace TTT.CS2.Configs;
 
 public class CS2ShopConfig : IStorage<ShopConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_STARTING_INNOCENT_CREDITS = new(
-    "css_ttt_shop_start_innocent", "Starting credits for Innocents", 80,
+    "css_ttt_shop_start_innocent", "Starting credits for Innocents", 60,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<int> CV_STARTING_TRAITOR_CREDITS = new(

TTT/CS2/Configs/ShopItems/CS2M4A1Config.cs

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 75,
+    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 50,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(

TTT/CS2/GameHandlers/EntityTargetHandlers.cs

@@ -0,0 +1,37 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Messages;
+
+namespace TTT.CS2.GameHandlers;
+
+public class EntityTargetHandlers(IServiceProvider provider) : IPluginModule {
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.HookEntityOutput("*", "*", handler);
+  }
+
+  private HookResult handler(CEntityIOOutput output, string name,
+    CEntityInstance activator, CEntityInstance caller, CVariant value,
+    float delay) {
+    messenger.Debug("Entity Output Triggered: " + name);
+    messenger.Debug("Activator: " + activator.DesignerName);
+    messenger.Debug("Caller: " + caller.DesignerName);
+    messenger.Debug("Value: " + value);
+    if (caller.DesignerName == "prop_dynamic") return HookResult.Continue;
+    if (caller.DesignerName != "filter_activator_name")
+      return HookResult.Continue;
+    var csPlayer = Utilities.GetPlayerFromIndex((int)activator.Index);
+    if (csPlayer == null || !csPlayer.IsValid) return HookResult.Continue;
+    messenger.DebugAnnounce("Filter Activator Name triggered by player: "
+      + csPlayer.PlayerName);
+    messenger.DebugAnnounce(output + " - " + output.Description);
+    return HookResult.Continue;
+  }
+}

TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs

@@ -0,0 +1,26 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Game;
+
+namespace TTT.CS2.GameHandlers;
+
+public class MapChangeCausesEndListener(IServiceProvider provider)
+  : IPluginModule {
+  private readonly IGameManager games =
+    provider.GetRequiredService<IGameManager>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
+      onMapChange);
+  }
+
+  private void onMapChange(string mapName) {
+    games.ActiveGame?.EndGame(new EndReason("Map Change"));
+    Server.PrintToConsole("Detected map change, ending active game.");
+  }
+}

TTT/CS2/Listeners/AfkTimerListener.cs

@@ -77,7 +77,8 @@ public class AfkTimerListener(IServiceProvider provider)
   private List<CCSPlayerController> getAfkPlayers() {
     return Utilities.GetPlayers()
      .Where(p => p.PlayerPawn.Value != null
-        && !p.PlayerPawn.Value.HasMovedSinceSpawn)
+        && p is { Team: CsTeam.CounterTerrorist or CsTeam.Terrorist }
+        && p.GetHealth() >= 0 && !p.PlayerPawn.Value.HasMovedSinceSpawn)
      .ToList();
   }
 }

TTT/CS2/Player/CS2AliveSpoofer.cs

@@ -60,8 +60,12 @@ public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
     this.plugin = plugin;
     plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnTick>(
       onTick);
+    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
+      onMapStart);
   }
 
+  private void onMapStart(string mapName) { _fakeAlivePlayers.Clear(); }
+
   [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnDisconnect(EventPlayerDisconnect ev, GameEventInfo _) {

TTT/CS2/Player/CS2Player.cs

@@ -47,10 +47,6 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
     }
   }
 
-  private int namePadding
-    => Math.Min(Utilities.GetPlayers().Select(p => p.PlayerName.Length).Max(),
-      24);
-
   public bool Equals(CS2Player? other) {
     if (other is null) return false;
     return Id == other.Id;
@@ -119,6 +115,11 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
   // Goal: Pad the name to a fixed width for better alignment in logs
   // Left-align ID, right-align name
   private string createPaddedName() {
+    var onlineLengths = Utilities.GetPlayers()
+     .Select(p => p.PlayerName.Length)
+     .ToList();
+    if (onlineLengths.Count == 0) return CreatePaddedName(Id, Name, 13);
+    var namePadding = Math.Min(onlineLengths.Max(), 24);
     return CreatePaddedName(Id, Name, namePadding + 8);
   }
 

TTT/CS2/Roles/CS2TraitorRole.cs

@@ -0,0 +1,21 @@
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Player;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Roles;
+
+public class CS2TraitorRole(IServiceProvider provider) : TraitorRole(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public override void OnAssign(IOnlinePlayer player) {
+    base.OnAssign(player);
+
+    var gamePlayer = converter.GetPlayer(player);
+    if (gamePlayer == null) return;
+
+    gamePlayer.AcceptInput("SetTargetName", null, null, "traitor");
+    if (gamePlayer.Pawn.Value != null) gamePlayer.Pawn.Value.Target = "traitor";
+  }
+}

TTT/CS2/Utils/RoundUtil.cs

@@ -50,7 +50,8 @@ public static class RoundUtil {
 
   public static void EndRound(RoundEndReason reason) {
     var gameRules = ServerUtil.GameRulesProxy;
-    if (gameRules == null || gameRules.GameRules == null) return;
+    if (gameRules == null || gameRules.GameRules == null || !gameRules.IsValid)
+      return;
     // TODO: Figure out what these params do
     // TerminateRoundFunc.Invoke(gameRules.GameRules.Handle, 5f, reason, 0, 0);
     VirtualFunctions.TerminateRoundFunc.Invoke(gameRules.GameRules.Handle,

TTT/Shop/PeriodicRewarder.cs

@@ -98,7 +98,7 @@ public class PeriodicRewarder(IServiceProvider provider) : ITerrorModule {
     if (positions.Count < 2) return 0f;
     var totalDistance = 0f;
     for (var i = 1; i < positions.Count; i++)
-      totalDistance += positions[i].Distance(positions[i - 1]);
+      totalDistance += positions[i].DistanceSquared(positions[i - 1]);
 
 
     return totalDistance;

TTT/ShopAPI/Configs/BodyPaintConfig.cs

@@ -4,6 +4,6 @@ namespace ShopAPI.Configs;
 
 public record BodyPaintConfig : ShopItemConfig {
   public override int Price { get; init; } = 40;
-  public int MaxUses { get; init; } = 2;
+  public int MaxUses { get; init; } = 4;
   public Color ColorToApply { get; init; } = Color.GreenYellow;
 }

TTT/ShopAPI/Configs/CamoConfig.cs

@@ -2,5 +2,5 @@ namespace ShopAPI.Configs;
 
 public record CamoConfig : ShopItemConfig {
   public override int Price { get; init; } = 75;
-  public float CamoVisibility { get; init; } = 0.4f;
+  public float CamoVisibility { get; init; } = 0.6f;
 }

TTT/ShopAPI/Configs/Detective/HealthStationConfig.cs

@@ -3,7 +3,7 @@
 namespace ShopAPI.Configs.Detective;
 
 public record HealthStationConfig : StationConfig {
-  public override string UseSound { get; init; } = "sounds/buttons/blip1";
+  public virtual string UseSound { get; init; } = "sounds/buttons/blip1";
 
   public override int Price { get; init; } = 50;
 

TTT/ShopAPI/Configs/StationConfig.cs

@@ -5,12 +5,11 @@ namespace ShopAPI.Configs;
 public abstract record StationConfig : ShopItemConfig {
   public virtual int HealthIncrements { get; init; } = 5;
   public virtual int TotalHealthGiven { get; init; } = 0;
-  public virtual int StationHealth { get; init; } = 1000;
+  public virtual int StationHealth { get; init; } = 200;
   public virtual float MaxRange { get; init; } = 256;
 
   public virtual TimeSpan HealthInterval { get; init; } =
     TimeSpan.FromSeconds(1);
 
-  public abstract string UseSound { get; init; }
   public abstract Color GetColor(float health);
 }

TTT/ShopAPI/Configs/Traitor/DamageStationConfig.cs

@@ -6,7 +6,7 @@ public record DamageStationConfig : StationConfig {
   public override int HealthIncrements { get; init; } = -25;
   public override int TotalHealthGiven { get; init; } = -3000;
 
-  public override string UseSound { get; init; } = "sounds/buttons/blip2";
+  public virtual string UseSound { get; init; } = "sounds/buttons/blip2";
 
   public override int Price { get; init; } = 65;
 

TTT/ShopAPI/Configs/Traitor/SilentAWPConfig.cs

@@ -3,9 +3,9 @@
 namespace ShopAPI.Configs.Traitor;
 
 public record SilentAWPConfig : ShopItemConfig, IWeapon {
-  public override int Price { get; init; } = 90;
+  public override int Price { get; init; } = 80;
   public int WeaponIndex { get; } = 9;
   public string WeaponId { get; } = "weapon_awp";
   public int? ReserveAmmo { get; } = 0;
-  public int? CurrentAmmo { get; } = 2;
+  public int? CurrentAmmo { get; } = 1;
 }

TTT/SpecialRound/Rounds/SpeedRound.cs

@@ -44,7 +44,8 @@ public class SpeedRound(IServiceProvider provider)
   public override void ApplyRoundEffects() {
     Provider.GetService<RoundTimerListener>()?.EndTimer?.Dispose();
 
-    setTime(config.InitialSeconds);
+    Server.RunOnTick(Server.TickCount + 2,
+      () => setTime(config.InitialSeconds));
   }
 
   private void addTime(TimeSpan span) {

TTT/SpecialRound/SpecialRoundTracker.cs

@@ -2,6 +2,7 @@
 using SpecialRoundAPI;
 using TTT.API;
 using TTT.API.Events;
+using TTT.API.Game;
 using TTT.Game.Events.Game;
 
 namespace SpecialRound;
@@ -15,5 +16,8 @@ public class SpecialRoundTracker : ISpecialRoundTracker, ITerrorModule,
 
   [UsedImplicitly]
   [EventHandler]
-  public void OnRoundEnd(GameStateUpdateEvent ev) { CurrentRound = null; }
+  public void OnRoundEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+    CurrentRound = null;
+  }
 }

TTT/Stats/RoundListener.cs

@@ -133,11 +133,7 @@ public class RoundListener(IServiceProvider provider)
   }
 
   private async Task onRoundEnd(IGame game) {
-    Console.WriteLine("RoundListener: onRoundEnd fired");
-    if (CurrentRoundId == null) {
-      Console.WriteLine("RoundListener: currentRoundId is null, skipping");
-      return;
-    }
+    if (CurrentRoundId == null) return;
 
     var ended_at = DateTime.UtcNow;
     var winning_role = game.WinningRole != null ?

TTT/Stats/StatsApi.cs

@@ -9,10 +9,10 @@ public class StatsApi {
 
   public static string ApiNameForRole(IRole role) {
     return role switch {
-      _ when role is TraitorRole   => "traitor",
-      _ when role is DetectiveRole => "detective",
-      _ when role is InnocentRole  => "innocent",
-      _                            => "unknown"
+      TraitorRole   => "traitor",
+      DetectiveRole => "detective",
+      InnocentRole  => "innocent",
+      _             => "unknown"
     };
   }
 }