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

More fixes for 25th

Browse Source
This commit is contained in:
John Gross
2020-11-25 12:26:18 -08:00
parent a4edbf3bd9
commit 15c4276a81
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ namespace Torch.Server.Managers
_gameServerValidateAuthTicketReplacer = _gameServerValidateAuthTicketFactory.Invoke(); _gameServerValidateAuthTicketReplacer = _gameServerValidateAuthTicketFactory.Invoke();
_gameServerUserGroupStatusReplacer = _gameServerUserGroupStatusFactory.Invoke(); _gameServerUserGroupStatusReplacer = _gameServerUserGroupStatusFactory.Invoke();
_gameServerValidateAuthTicketReplacer.Replace( _gameServerValidateAuthTicketReplacer.Replace(
new Action<ulong, JoinResult, ulong>(ValidateAuthTicketResponse), MyGameService.GameServer); new Action<ulong, JoinResult, ulong, string>(ValidateAuthTicketResponse), MyGameService.GameServer);
_gameServerUserGroupStatusReplacer.Replace(new Action<ulong, ulong, bool, bool>(UserGroupStatusResponse), _gameServerUserGroupStatusReplacer.Replace(new Action<ulong, ulong, bool, bool>(UserGroupStatusResponse),
MyGameService.GameServer); MyGameService.GameServer);
_log.Info("Inserted steam authentication intercept"); _log.Info("Inserted steam authentication intercept");
@@ -214,7 +214,7 @@ namespace Torch.Server.Managers
} }
//Largely copied from SE //Largely copied from SE
private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner) private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner, string serviceName)
{ {
var state = new MyP2PSessionState(); var state = new MyP2PSessionState();
MySteamServiceWrapper.Static.Peer2Peer.GetSessionState(steamId, ref state); MySteamServiceWrapper.Static.Peer2Peer.GetSessionState(steamId, ref state);

2
Torch.Server/Views/WorldGeneratorDialog.xaml.cs
View File

@@ -56,7 +56,7 @@ namespace Torch.Server
string localizedName = MyTexts.GetString(sessionNameId); string localizedName = MyTexts.GetString(sessionNameId);
var checkpoint = MyLocalCache.LoadCheckpoint(directory, out _); var checkpoint = MyLocalCache.LoadCheckpoint(directory, out _);
checkpoint.OnlineMode = MyOnlineModeEnum.PUBLIC; checkpoint.OnlineMode = MyOnlineModeEnum.PUBLIC;
_checkpoints.Add(new PremadeCheckpointItem { Name = localizedName, Icon = Path.Combine(directory, "thumb.jpg"), Path = directory, Checkpoint = checkpoint}); _checkpoints.Add(new PremadeCheckpointItem { Name = localizedName, Icon = Path.Combine(directory.Replace("Sandbox.sbc", ""), "thumb.jpg"), Path = directory, Checkpoint = checkpoint});
} }
/* /*

2
Torch/VRageGame.cs
View File

@@ -32,6 +32,7 @@ using VRage.Game.ObjectBuilder;
using VRage.Game.SessionComponents; using VRage.Game.SessionComponents;
using VRage.GameServices; using VRage.GameServices;
using VRage.Plugins; using VRage.Plugins;
using VRage.Scripting;
using VRage.Steam; using VRage.Steam;
using VRage.Utils; using VRage.Utils;
using VRageRender; using VRageRender;
@@ -154,6 +155,7 @@ namespace Torch
MyPerGameSettings.SendLogToKeen = false; MyPerGameSettings.SendLogToKeen = false;
// SpaceEngineersGame.SetupAnalytics(); // SpaceEngineersGame.SetupAnalytics();
MyVRage.Platform.InitScripting(MyVRageScripting.Create());
MyFileSystem.ExePath = Path.GetDirectoryName(typeof(SpaceEngineersGame).Assembly.Location); MyFileSystem.ExePath = Path.GetDirectoryName(typeof(SpaceEngineersGame).Assembly.Location);
_tweakGameSettings(); _tweakGameSettings();