Skip to content

bug: fix invalid config being applied #168

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

Merged
lukepolo merged 1 commit into from
Aug 7, 2026
Merged

bug: fix invalid config being applied #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 42 additions & 13 deletions apps/counterstrikesharp/src/FiveStack.Services/MatchManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ public class MatchManager
private MatchData? _matchData;
private eMapStatus _currentMapStatus = eMapStatus.Unknown;
private Guid? _activeMapId;

// Distinct from _activeMapId, which is stamped at map start for event
// attribution: this only moves once the server-side setup (cfg exec +
// game mode) has actually run for that map. Gating setup on _activeMapId
// instead means every map the plugin itself loads is already "active"
// before setup runs, so maps 2+ silently skip their cfg.
private Guid? _configuredMapId;
private Timer? _resumeMessageTimer;
private Timer? _playcastWindowTimer;
public bool gameEnded = false;
Expand Down Expand Up @@ -496,7 +503,7 @@ public void SetupMatch(MatchData match)
return;
}

bool wasAlreadySetup = _activeMapId == _currentMap.id;
bool wasAlreadySetup = _configuredMapId == _currentMap.id;
_activeMapId = _currentMap.id;

if (_currentMapStatus == eMapStatus.WaitingForTV)
Expand Down Expand Up @@ -535,6 +542,8 @@ public void SetupMatch(MatchData match)

if (!wasAlreadySetup)
{
_configuredMapId = _currentMap.id;

_gameServer.SendCommands([$"exec 5stack.{_matchData.options.type.ToLower()}.cfg"]);

if (_matchData.is_lan)
Expand Down Expand Up @@ -713,49 +722,68 @@ public void ChangeMap(Map map)
_gameServer.SendCommands(["tv_broadcast 0"]);
Reset();

// The mode decides which layout the map loads with (Wingman gets the
// 2v2 version), so it ships in the same batch as the level change and
// ahead of it — Valve's documented form is "game_type 0; game_mode 2;
// map <name>". Setting it after the load leaves the map on whatever
// the previous map's mode was.
string[] gameModeCommands = GetGameModeCommands();

if (map.workshop_map_id == null && Server.IsMapValid(map.name))
{
_logger.LogInformation(
$"Changing Map {map.name} (match {_matchData?.id.ToString() ?? "none"})"
);
_gameServer.SendCommands([$"changelevel \"{map.name}\""]);
_gameServer.SendCommands([.. gameModeCommands, $"changelevel \"{map.name}\""]);
}
else
{
_logger.LogInformation(
$"Changing Map {map.name} / {map.workshop_map_id} (match {_matchData?.id.ToString() ?? "none"})"
);
_gameServer.SendCommands([$"host_workshop_map {map.workshop_map_id}"]);
_gameServer.SendCommands(
[.. gameModeCommands, $"host_workshop_map {map.workshop_map_id}"]
);
}
}

private void SetupGameMode()
// game_type/game_mode are integers, not mode names: game_type 0 (Classic)
// with game_mode 1 = Competitive, game_mode 2 = Wingman/2v2. Sent as console
// commands rather than typed ConVar writes — ConVar.Find returning null or a
// differently-typed handle would silently leave the server in the wrong mode.
private string[] GetGameModeCommands()
{
if (_matchData == null)
{
return;
return [];
}

ConVar.Find("game_type")?.SetValue(0);
if (_matchData.options.type == "Duel" || _matchData.options.type == "Wingman")
{
ConVar.Find("game_mode")?.SetValue(2);
}
else
int gameMode =
_matchData.options.type == "Duel" || _matchData.options.type == "Wingman" ? 2 : 1;

return ["game_type 0", $"game_mode {gameMode}"];
}

private void SetupGameMode()
{
if (_matchData == null)
{
ConVar.Find("game_mode")?.SetValue(1);
return;
}

string[] gameModeCommands = GetGameModeCommands();

// game_type/game_mode only take effect after a restart, but restarting an
// in-progress match (e.g. on a plugin reload) would wrongly reset it. Only
// restart during warmup, when a fresh game start is expected.
if (!IsWarmup())
{
_gameServer.SendCommands(gameModeCommands);
_logger.LogInformation("SetupGameMode: not in warmup, skipping mp_restartgame");
return;
}

_gameServer.SendCommands(["mp_restartgame 1"]);
_gameServer.SendCommands([.. gameModeCommands, "mp_restartgame 1"]);
}

public int GetExpectedPlayerCount()
Expand Down Expand Up @@ -1202,6 +1230,7 @@ public void Reset()
StopPlaycastWindowHeartbeat();

_currentMapStatus = eMapStatus.Unknown;
_configuredMapId = null;

gameEnded = false;

Expand Down
56 changes: 43 additions & 13 deletions apps/swiftly/src/FiveStack.Services/MatchManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ public class MatchManager
private MatchData? _matchData;
private eMapStatus _currentMapStatus = eMapStatus.Unknown;
private Guid? _activeMapId;

// Distinct from _activeMapId, which is stamped at map start for event
// attribution: this only moves once the server-side setup (cfg exec +
// game mode) has actually run for that map. Gating setup on _activeMapId
// instead means every map the plugin itself loads is already "active"
// before setup runs, so maps 2+ silently skip their cfg.
private Guid? _configuredMapId;
private CancellationTokenSource? _resumeMessageTimer;
private CancellationTokenSource? _playcastWindowTimer;
public bool gameEnded = false;
Expand Down Expand Up @@ -484,7 +491,7 @@ public void SetupMatch(MatchData match)
return;
}

bool wasAlreadySetup = _activeMapId == _currentMap.id;
bool wasAlreadySetup = _configuredMapId == _currentMap.id;
_activeMapId = _currentMap.id;

if (_currentMapStatus == eMapStatus.WaitingForTV)
Expand Down Expand Up @@ -522,6 +529,8 @@ public void SetupMatch(MatchData match)

if (!wasAlreadySetup)
{
_configuredMapId = _currentMap.id;

_gameServer.SendCommands([$"exec 5stack.{_matchData.options.type.ToLower()}.cfg"]);

if (_matchData.is_lan)
Expand Down Expand Up @@ -706,49 +715,69 @@ public void ChangeMap(Map map)
_gameServer.SendCommands(["tv_broadcast 0"]);
Reset();

// The mode decides which layout the map loads with (Wingman gets the
// 2v2 version), so it ships in the same batch as the level change and
// ahead of it — Valve's documented form is "game_type 0; game_mode 2;
// map <name>". Setting it after the load leaves the map on whatever
// the previous map's mode was.
string[] gameModeCommands = GetGameModeCommands();

if (map.workshop_map_id == null && _core.Engine.IsMapValid(map.name))
{
_logger.LogInformation(
$"Changing Map {map.name} (match {_matchData?.id.ToString() ?? "none"})"
);
_gameServer.SendCommands([$"changelevel \"{map.name}\""]);
_gameServer.SendCommands([.. gameModeCommands, $"changelevel \"{map.name}\""]);
}
else
{
_logger.LogInformation(
$"Changing Map {map.name} / {map.workshop_map_id} (match {_matchData?.id.ToString() ?? "none"})"
);
_gameServer.SendCommands([$"host_workshop_map {map.workshop_map_id}"]);
_gameServer.SendCommands(
[.. gameModeCommands, $"host_workshop_map {map.workshop_map_id}"]
);
}
}

private void SetupGameMode()
// game_type/game_mode are integers, not mode names: game_type 0 (Classic)
// with game_mode 1 = Competitive, game_mode 2 = Wingman/2v2. Sent as console
// commands rather than typed convar writes — a convar lookup that misses or
// comes back differently typed would silently leave the server in the wrong
// mode.
private string[] GetGameModeCommands()
{
if (_matchData == null)
{
return;
return [];
}

SetConVar("game_type", 0);
if (_matchData.options.type == "Duel" || _matchData.options.type == "Wingman")
{
SetConVar("game_mode", 2);
}
else
int gameMode =
_matchData.options.type == "Duel" || _matchData.options.type == "Wingman" ? 2 : 1;

return ["game_type 0", $"game_mode {gameMode}"];
}

private void SetupGameMode()
{
if (_matchData == null)
{
SetConVar("game_mode", 1);
return;
}

string[] gameModeCommands = GetGameModeCommands();

// game_type/game_mode only take effect after a restart, but restarting an
// in-progress match (e.g. on a plugin reload) would wrongly reset it. Only
// restart during warmup, when a fresh game start is expected.
if (!IsWarmup())
{
_gameServer.SendCommands(gameModeCommands);
_logger.LogInformation("SetupGameMode: not in warmup, skipping mp_restartgame");
return;
}

_gameServer.SendCommands(["mp_restartgame 1"]);
_gameServer.SendCommands([.. gameModeCommands, "mp_restartgame 1"]);
}

public int GetExpectedPlayerCount()
Expand Down Expand Up @@ -1177,6 +1206,7 @@ public void Reset()
StopPlaycastWindowHeartbeat();

_currentMapStatus = eMapStatus.Unknown;
_configuredMapId = null;

gameEnded = false;

Expand Down
Loading