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:
John Gross
2019-01-16 21:17:47 -08:00
parent ffc6a60ee9 8b7a07ffe7
commit 4e2e58bb4c
4 changed files with 99 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Torch.Server/Managers/InstanceManager.cs
View File

@@ -167,6 +167,16 @@ namespace Torch.Server.Managers
public void SaveConfig()
{
var cf = Torch.Config as TorchConfig;
if (cf?.ReservedPlayers?.Count > 0)
{
foreach (var res in cf.ReservedPlayers)
{
if (!DedicatedConfig.Reserved.Contains(res))
DedicatedConfig.Reserved.Add(res);
}
}
DedicatedConfig.Save(Path.Combine(Torch.Config.InstancePath, CONFIG_NAME));
Log.Info("Saved dedicated config.");

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

@@ -258,8 +258,7 @@ 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) ||
MySandboxGame.ConfigDedicated.Reserved.Contains(info.SteamID)))
else if (MySandboxGame.ConfigDedicated.Reserved.Contains(info.SteamID))
internalAuth = JoinResult.OK;
//Admins can bypass member limit
else if (MySandboxGame.ConfigDedicated.Administrators.Contains(info.SteamID.ToString()) ||