Skip to content

potential fix to make css_rs a catch-all #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CyberFlameGO wants to merge 2 commits into
base: main
Choose a base branch
from
Open

potential fix to make css_rs a catch-all #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6591a70
ai lmao
CyberFlameGO Jun 7, 2026
7555c96
Merge branch 'main' into main
CyberFlameGO Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 58 additions & 60 deletions src/Commands/ChatCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,83 +968,40 @@ public async Task SRCommandHandler(CCSPlayerController? player, string _playerNa
}
}

[ConsoleCommand("css_rb", "Teleports you to Bonus start")]
[ConsoleCommand("css_b", "alias for !rb")]
[CommandHelper(whoCanExecute: CommandUsage.CLIENT_ONLY)]
public void RespawnBonusPlayer(CCSPlayerController? player, CommandInfo command)
public void RespawnBonusPlayerHelper(CCSPlayerController player, int bonusX)
{
try
{
if (!IsAllowedPlayer(player) || respawnEnabled == false)
return;

var slot = player!.Slot;
var playerName = player.PlayerName;
var steamID = player.SteamID.ToString();

Utils.LogDebug($"{playerName} calling css_rb...");

if (CommandCooldown(player))
return;

var slot = player.Slot;
if (ReplayCheck(player))
return;

//defaults to !b 1 without any args
if (command.ArgString == null || command.ArgString == "")
{
if (bonusRespawnPoses[1] != null)
{
if (bonusRespawnAngs.TryGetValue(1, out QAngle_t? bonusAng) && bonusAng != null)
{
player.PlayerPawn.Value!.Teleport(bonusRespawnPoses[1]!, bonusRespawnAngs[1]!, new Vector_t(0, 0, 0));
}
else
{
player.PlayerPawn.Value!.Teleport(bonusRespawnPoses[1]!, player.PlayerPawn.Value?.EyeAngles.ToQAngle_t(), new Vector_t(0, 0, 0));
}
Utils.LogDebug($"{player.PlayerName} css_rb {1} to {bonusRespawnPoses[1]}");
}
else
{
Utils.PrintToChat(player, Localizer["no_respawnpos_bonus_index", 1]);
}
Server.NextFrame(() =>
{
playerTimers[slot].IsTimerRunning = false;
playerTimers[slot].TimerTicks = 0;
playerTimers[slot].IsBonusTimerRunning = false;
playerTimers[slot].BonusTimerTicks = 0;
playerTimers[slot].IsTimerBlocked = false;
});
PlaySound(player, respawnSound);
return;
}

if (!int.TryParse(command.ArgString, out int bonusX))
{
Utils.LogDebug("css_rb conversion failed. The input string is not a valid integer.");
Utils.PrintToChat(player, Localizer["no_respawnpos_bonus_rb"]);
return;
}

// Remove checkpoints for the current player
if (!playerTimers[slot].IsTimerBlocked)
{
playerCheckpoints.Remove(slot);
}

if (bonusRespawnPoses[bonusX] != null)
if (bonusRespawnPoses.TryGetValue(bonusX, out var pos) && pos != null)
{
if (bonusRespawnAngs.TryGetValue(bonusX, out QAngle_t? bonusAng) && bonusAng != null)
player.PlayerPawn.Value!.Teleport(bonusRespawnPoses[bonusX]!, bonusRespawnAngs[bonusX]!, new Vector_t(0, 0, 0));
player.PlayerPawn.Value!.Teleport(pos, bonusAng, new Vector_t(0, 0, 0));
else
player.PlayerPawn.Value!.Teleport(bonusRespawnPoses[bonusX]!, player.PlayerPawn.Value?.EyeAngles.ToQAngle_t(), new Vector_t(0, 0, 0));
player.PlayerPawn.Value!.Teleport(pos, player.PlayerPawn.Value?.EyeAngles.ToQAngle_t(), new Vector_t(0, 0, 0));

Utils.LogDebug($"{player.PlayerName} css_rb {bonusX} to {bonusRespawnPoses[bonusX]}");
Utils.LogDebug($"{player.PlayerName} css_rb {bonusX} to {pos}");
}
else
Utils.PrintToChat(player, Localizer["no_respawnpos_bonus"]);
{
if (bonusX == 1)
Utils.PrintToChat(player, Localizer["no_respawnpos_bonus_index", 1]);
else
Utils.PrintToChat(player, Localizer["no_respawnpos_bonus"]);
return;
}

Server.NextFrame(() =>
{
Expand All @@ -1059,8 +1016,35 @@ public void RespawnBonusPlayer(CCSPlayerController? player, CommandInfo command)
}
catch (Exception ex)
{
Utils.LogError($"Exception in RespawnBonusPlayer: {ex.Message}");
Utils.LogError($"Exception in RespawnBonusPlayerHelper: {ex.Message}");
}
}

[ConsoleCommand("css_rb", "Teleports you to Bonus start")]
[ConsoleCommand("css_b", "alias for !rb")]
[CommandHelper(whoCanExecute: CommandUsage.CLIENT_ONLY)]
public void RespawnBonusPlayer(CCSPlayerController? player, CommandInfo command)
{
if (!IsAllowedPlayer(player))
return;

Utils.LogDebug($"{player!.PlayerName} calling css_rb...");

if (CommandCooldown(player))
return;

int bonusX = 1;
if (!string.IsNullOrEmpty(command.ArgString))
{
if (!int.TryParse(command.ArgString, out bonusX))
{
Utils.LogDebug("css_rb conversion failed. The input string is not a valid integer.");
Utils.PrintToChat(player, Localizer["no_respawnpos_bonus_rb"]);
return;
}
}

RespawnBonusPlayerHelper(player, bonusX);
}

[ConsoleCommand("css_startpos", "Saves a custom respawn point within the start trigger")]
Expand Down Expand Up @@ -1564,20 +1548,34 @@ public void RestartCurrentStageCmd(CCSPlayerController? player, CommandInfo comm
if (CommandCooldown(player))
return;

if (!playerTimers.TryGetValue(slot, out PlayerTimerInfo? playerTimer))
{
Utils.PrintToChat(player, Localizer["error_occured"]);
Utils.LogDebug("Failed to get playerTimer.");
return;
}

if (playerTimer.IsBonusTimerRunning || playerTimer.BonusStage != 0)
{
int bonusX = playerTimer.BonusStage != 0 ? playerTimer.BonusStage : 1;
RespawnBonusPlayerHelper(player, bonusX);
return;
}

if (stageTriggerCount == 0)
{
if (enableRsOnLinear) {
player.ExecuteClientCommandFromServer("css_r");
RespawnPlayerCommand(player, command);
return;
}
Utils.PrintToChat(player, Localizer["map_no_stages"]);
return;
}

if (!playerTimers.TryGetValue(slot, out PlayerTimerInfo? playerTimer) || playerTimer.CurrentMapStage == 0)
if (playerTimer.CurrentMapStage == 0)
{
Utils.PrintToChat(player, Localizer["error_occured"]);
Utils.LogDebug("Failed to get playerTimer or playerTimer.CurrentMapStage == 0.");
Utils.LogDebug("playerTimer.CurrentMapStage == 0.");
return;
}

Expand Down
2 changes: 2 additions & 0 deletions src/SharpTimer.csproj.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=commands/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>