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

Add OnlineMode to session settings. Only allow admins to join an Offline game.

Browse Source
This commit is contained in:
Brant Martin
2018-08-20 20:06:32 -04:00
parent 016203d2bc
commit 355375e9db
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ using Torch.Managers;
using Torch.Utils; using Torch.Utils;
using Torch.ViewModels; using Torch.ViewModels;
using VRage.Game; using VRage.Game;
using VRage.Game.ModAPI;
using VRage.GameServices; using VRage.GameServices;
using VRage.Network; using VRage.Network;
using VRage.Steam; using VRage.Steam;
@@ -153,7 +154,9 @@ namespace Torch.Server.Managers
//SteamNetworking.GetP2PSessionState(new CSteamID(steamId), out P2PSessionState_t state); //SteamNetworking.GetP2PSessionState(new CSteamID(steamId), out P2PSessionState_t state);
var ip = "0"; //state.GetRemoteIP(); var ip = "0"; //state.GetRemoteIP();
_log.Debug($"ValidateAuthTicketResponse(user={steamId}, response={response}, owner={steamOwner})"); Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);
_log.Debug($"ValidateAuthTicketResponse(user={steamId}, response={response}, owner={steamOwner}, permissions={promoteLevel})");
_log.Info($"Connection attempt by {steamId} from {ip}"); _log.Info($"Connection attempt by {steamId} from {ip}");
// TODO implement IP bans // TODO implement IP bans
@@ -164,7 +167,7 @@ namespace Torch.Server.Managers
UserRejected(steamId, JoinResult.NotInGroup); UserRejected(steamId, JoinResult.NotInGroup);
} }
else if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE && else if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
!Torch.CurrentSession.KeenSession.IsUserAdmin(steamId)) promoteLevel < MyPromoteLevel.Admin)
{ {
_log.Warn($"Rejecting user {steamId}, world is set to offline and user is not admin."); _log.Warn($"Rejecting user {steamId}, world is set to offline and user is not admin.");
UserRejected(steamId, JoinResult.TicketCanceled); UserRejected(steamId, JoinResult.TicketCanceled);

2
Torch.Server/ViewModels/SessionSettingsViewModel.cs
View File

@@ -18,6 +18,8 @@ namespace Torch.Server.ViewModels
[Torch.Views.Display(Description = "The type of the game mode.", Name = "Game Mode", GroupName = "Others")] [Torch.Views.Display(Description = "The type of the game mode.", Name = "Game Mode", GroupName = "Others")]
public MyGameModeEnum GameMode { get => _settings.GameMode; set => SetValue(ref _settings.GameMode, value); } public MyGameModeEnum GameMode { get => _settings.GameMode; set => SetValue(ref _settings.GameMode, value); }
[Torch.Views.Display(Description = "The type of the game online mode.", Name = "Online Mode", GroupName = "Others")]
public MyOnlineModeEnum OnlineMode { get => _settings.OnlineMode; set => SetValue(ref _settings.OnlineMode, value); }
[Torch.Views.Display(Description = "The multiplier for inventory size.", Name = "Inventory Size", GroupName = "Multipliers")] [Torch.Views.Display(Description = "The multiplier for inventory size.", Name = "Inventory Size", GroupName = "Multipliers")]
public float InventorySizeMultiplier { get => _settings.InventorySizeMultiplier; set => SetValue(ref _settings.InventorySizeMultiplier, value); } public float InventorySizeMultiplier { get => _settings.InventorySizeMultiplier; set => SetValue(ref _settings.InventorySizeMultiplier, value); }