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

Merge pull request #415 from foogs/master

Browse Source 
YOUR PRIVACY HAS BEEN DELETED
This commit is contained in:
Jimmacle
2020-11-25 21:59:43 -08:00
committed by GitHub
parent f7a63f17cc f25a412a47
commit 19f9388a43
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,17 +215,16 @@ namespace Torch.Server.Managers
//Largely copied from SE
private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner, string serviceName)
{
// TODO: Find another way to do this
//var state = new MyP2PSessionState();
//MySteamServiceWrapper.Static.Peer2Peer.GetSessionState(steamId, ref state);
//var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
{
var state = new MyP2PSessionState();
Sandbox.Engine.Networking.MyGameService.Peer2Peer.GetSessionState(steamId, ref state);
var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
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}");
_log.Info($"Connection attempt by {steamId} from {ip}");
if (IsProfiling(steamId))
{

21
Torch/Commands/TorchCommands.cs
View File

@@ -37,14 +37,19 @@ namespace Torch.Commands
[Permission(MyPromoteLevel.None)]
public void GetIP(ulong steamId = 0)
{
Context.Respond("Command no longer working!");
//if (steamId == 0)
// steamId = Context.Player.SteamUserId;
//
//VRage.GameServices.MyP2PSessionState statehack = new VRage.GameServices.MyP2PSessionState();
//MySteamServiceWrapper.Static.Peer2Peer.GetSessionState(steamId, ref statehack);
//var ip = new IPAddress(BitConverter.GetBytes(statehack.RemoteIP).Reverse().ToArray());
//Context.Respond($"Your IP is {ip}");
if (steamId == 0)
{
steamId = Context.Player.SteamUserId;
}
else if (Context.Player.PromoteLevel <= MyPromoteLevel.Admin)
{
steamId = Context.Player.SteamUserId;
}
var state = new VRage.GameServices.MyP2PSessionState();
Sandbox.Engine.Networking.MyGameService.Peer2Peer.GetSessionState(steamId, ref state);
var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
Context.Respond($"Your IP is {ip}");
}
[Command("help", "Displays help for a command")]