Skip to content

Fix DM spawns finale special edition #1974

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
DESTROYGIRL merged 1 commit into from
May 24, 2026
Merged

Fix DM spawns finale special edition #1974

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
12 changes: 11 additions & 1 deletion src/game/server/neo/neo_spawn_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ namespace NeoSpawnManager
return nullptr;
}

if (!rules->IsTeamplay())
{
// Random selection every time for non-teamplay
manager.m_spawns.Shuffle();
}

CNEOSpawnPoint* backup = nullptr;
auto idx = manager.m_spawns.FindPredicate(
[rules, team, player, &backup](const auto& spawn)->bool
Expand Down Expand Up @@ -116,7 +122,11 @@ namespace NeoSpawnManager
return backup;
}

manager.m_spawns[idx].isUsed = true;
if (!rules->CanRespawnAnyTime())
{
// We only care if it's been used before or not if there are no respawns
manager.m_spawns[idx].isUsed = true;
}
return manager.m_spawns[idx].handle;
}

Expand Down
Loading