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

patch prep

Browse Source
This commit is contained in:
Brant Martin
2019-10-23 20:36:15 -04:00
parent fb67b2f3d1
commit 9c2dc69e3c
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Torch.Server/Initializer.cs
View File

@@ -16,7 +16,6 @@ using NLog.Targets;
using Sandbox.Engine.Utils; using Sandbox.Engine.Utils;
using Torch.Utils; using Torch.Utils;
using VRage.FileSystem; using VRage.FileSystem;
using VRage.Library.Exceptions;
namespace Torch.Server namespace Torch.Server
{ {

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

@@ -210,8 +210,9 @@ namespace Torch.Server.Managers
private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner) private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner)
{ {
var state = new MyP2PSessionState(); var state = new MyP2PSessionState();
MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state); //MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray()); //var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
string ip = "Can't acquire IP because Keen did a stupid";
Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel); Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);

13
Torch/Commands/TorchCommands.cs
View File

@@ -37,13 +37,14 @@ namespace Torch.Commands
[Permission(MyPromoteLevel.None)] [Permission(MyPromoteLevel.None)]
public void GetIP(ulong steamId = 0) public void GetIP(ulong steamId = 0)
{ {
if (steamId == 0) Context.Respond("Keen broke this command. Fix coming Soon(tm)");
steamId = Context.Player.SteamUserId; //if (steamId == 0)
// steamId = Context.Player.SteamUserId;
VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState(); //VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack); //VRage.Steam.MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray()); //var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
Context.Respond($"Your IP is {ip}"); //Context.Respond($"Your IP is {ip}");
} }
[Command("help", "Displays help for a command")] [Command("help", "Displays help for a command")]

2
Torch/Managers/ChatManager/ChatManagerServer.cs
View File

@@ -22,7 +22,7 @@ using VRage.Network;
namespace Torch.Managers.ChatManager namespace Torch.Managers.ChatManager
{ {
[PatchShim] //[PatchShim]
internal static class ChatInterceptPatch internal static class ChatInterceptPatch
{ {
private static ChatManagerServer _chatManager; private static ChatManagerServer _chatManager;

6
Torch/VRageGame.cs
View File

@@ -136,7 +136,9 @@ namespace Torch
{ {
bool dedicated = Sandbox.Engine.Platform.Game.IsDedicated; bool dedicated = Sandbox.Engine.Platform.Game.IsDedicated;
Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString()); Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString());
MyServiceManager.Instance.AddService<IMyGameService>(new MySteamService(dedicated, _appSteamId)); //KEEN WHY
var service = Activator.CreateInstance(Type.GetType("VRage.Steam.MySteamService, VRage.Steam"), new object[] {dedicated, _appSteamId});
MyServiceManager.Instance.AddService<IMyGameService>((IMyGameService)service);
if (dedicated && !MyGameService.HasGameServer) if (dedicated && !MyGameService.HasGameServer)
{ {
_log.Warn("Steam service is not running! Please reinstall dedicated server."); _log.Warn("Steam service is not running! Please reinstall dedicated server.");
@@ -176,7 +178,7 @@ namespace Torch
else else
{ {
MyPerformanceSettings preset = MyGuiScreenOptionsGraphics.GetPreset(MyRenderQualityEnum.NORMAL); MyPerformanceSettings preset = MyGuiScreenOptionsGraphics.GetPreset(MyRenderQualityEnum.NORMAL);
MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset) MyRenderProxy.Settings.User = MyVideoSettingsManager.GetGraphicsSettingsFromConfig(ref preset, false)
.PerformanceSettings.RenderSettings; .PerformanceSettings.RenderSettings;
MyStringId graphicsRenderer = MySandboxGame.Config.GraphicsRenderer; MyStringId graphicsRenderer = MySandboxGame.Config.GraphicsRenderer;
if (graphicsRenderer == MySandboxGame.DirectX11RendererKey) if (graphicsRenderer == MySandboxGame.DirectX11RendererKey)