Skip to content

Commit 9c2dc69

Browse files
committed
patch prep
1 parent fb67b2f commit 9c2dc69

5 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎Torch.Server/Initializer.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using Sandbox.Engine.Utils;
1717
using Torch.Utils;
1818
using VRage.FileSystem;
19-
using VRage.Library.Exceptions;
2019

2120
namespace Torch.Server
2221
{

‎Torch.Server/Managers/MultiplayerManagerDedicated.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ public WaitingForGroup(ulong id, JoinResult response, ulong owner)
210210
private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner)
211211
{
212212
var state = new MyP2PSessionState();
213-
MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
214-
var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
213+
//MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
214+
//var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
215+
string ip = "Can't acquire IP because Keen did a stupid";
215216

216217
Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);
217218

‎Torch/Commands/TorchCommands.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@ public class TorchCommands : CommandModule
3737
[Permission(MyPromoteLevel.None)]
3838
public void GetIP(ulong steamId = 0)
3939
{
40-
if (steamId == 0)
41-
steamId = Context.Player.SteamUserId;
42-
43-
VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
44-
VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
45-
var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
46-
Context.Respond($"Your IP is {ip}");
40+
Context.Respond("Keen broke this command. Fix coming Soon(tm)");
41+
//if (steamId == 0)
42+
// steamId = Context.Player.SteamUserId;
43+
44+
//VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
45+
//VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
46+
//var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
47+
//Context.Respond($"Your IP is {ip}");
4748
}
4849

4950
[Command("help", "Displays help for a command")]

‎Torch/Managers/ChatManager/ChatManagerServer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace Torch.Managers.ChatManager
2424
{
25-
[PatchShim]
25+
//[PatchShim]
2626
internal static class ChatInterceptPatch
2727
{
2828
private static ChatManagerServer _chatManager;

‎Torch/VRageGame.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ private void Create()
136136
{
137137
bool dedicated = Sandbox.Engine.Platform.Game.IsDedicated;
138138
Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString());
139-
MyServiceManager.Instance.AddService<IMyGameService>(new MySteamService(dedicated, _appSteamId));
139+
//KEEN WHY
140+
var service = Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), new object[] {dedicated, _appSteamId});
141+
MyServiceManager.Instance.AddService<IMyGameService>((IMyGameService)service);
140142
if (dedicated && !MyGameService.HasGameServer)
141143
{
142144
_log.Warn("Steam service is not running! Please reinstall dedicated server.");
@@ -176,7 +178,7 @@ private void Create()
176178
else
177179
{
178180
MyPerformanceSettings preset = MyGuiScreenOptionsGraphics.GetPreset(MyRenderQualityEnum.NORMAL);
179-
MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset)
181+
MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset, false)
180182
.PerformanceSettings.RenderSettings;
181183
MyStringId graphicsRenderer = MySandboxGame.Config.GraphicsRenderer;
182184
if (graphicsRenderer == MySandboxGame.DirectX11RendererKey)

0 commit comments

Comments
 (0)