tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race condition causing disconnected admins to appear in adminwho (#34033)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2024-12-24 01:18:31 +01:00
committed by GitHub
parent 2c4be6be00
commit 285e9349b6
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Administration/Managers/AdminManager.cs
View File

@@ -408,6 +408,17 @@ namespace Content.Server.Administration.Managers
} }
private async Task<(AdminData dat, int? rankId, bool specialLogin)?> LoadAdminData(ICommonSession session) private async Task<(AdminData dat, int? rankId, bool specialLogin)?> LoadAdminData(ICommonSession session)
{
var result = await LoadAdminDataCore(session);
// Make sure admin didn't disconnect while data was loading.
if (session.Status != SessionStatus.InGame)
return null;
return result;
}
private async Task<(AdminData dat, int? rankId, bool specialLogin)?> LoadAdminDataCore(ICommonSession session)
{ {
var promoteHost = IsLocal(session) && _cfg.GetCVar(CCVars.ConsoleLoginLocal) var promoteHost = IsLocal(session) && _cfg.GetCVar(CCVars.ConsoleLoginLocal)
|| _promotedPlayers.Contains(session.UserId) || _promotedPlayers.Contains(session.UserId)