PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' into Patron

Browse Source
This commit is contained in:
Brant Martin
2019-01-10 09:29:29 -05:00
parent 471912759a 3d8bf78213
commit fa1a968b8f
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Torch.Server/Managers/MultiplayerManagerDedicated.cs
View File

@@ -258,7 +258,8 @@ namespace Torch.Server.Managers
_log.Warn($"Rejecting user {info.SteamID} because they are not whitelisted in Torch.cfg.");
internalAuth = JoinResult.NotInGroup;
}
else if (config.EnableReservedSlots && config.ReservedPlayers.Contains(info.SteamID))
else if (config.EnableReservedSlots && (config.ReservedPlayers.Contains(info.SteamID) ||
MySandboxGame.ConfigDedicated.Reserved.Contains(info.SteamID)))
internalAuth = JoinResult.OK;
//Admins can bypass member limit
else if (MySandboxGame.ConfigDedicated.Administrators.Contains(info.SteamID.ToString()) ||