Cleaned up code after my massive bug fix
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
using ProtoBuf;
|
||||
using Sandbox.Game.World;
|
||||
using Sandbox.ModAPI;
|
||||
using SeamlessClientPlugin.SeamlessTransfer;
|
||||
using SeamlessClientPlugin.Utilities;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -31,15 +32,13 @@ namespace SeamlessClientPlugin.ClientMessages
|
||||
[ProtoMember(5)]
|
||||
public string PluginVersion = "0";
|
||||
|
||||
|
||||
|
||||
public ClientMessage(ClientMessageType Type)
|
||||
{
|
||||
MessageType = Type;
|
||||
|
||||
if (MyAPIGateway.Multiplayer != null && !MyAPIGateway.Multiplayer.IsServer)
|
||||
{
|
||||
if(MyAPIGateway.Session.LocalHumanPlayer == null)
|
||||
if (MyAPIGateway.Session.LocalHumanPlayer == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -57,12 +56,15 @@ namespace SeamlessClientPlugin.ClientMessages
|
||||
MessageData = Utility.Serialize(Data);
|
||||
}
|
||||
|
||||
public T DeserializeData<T>()
|
||||
|
||||
public Transfer GetTransferData()
|
||||
{
|
||||
if (MessageData == null)
|
||||
return default(T);
|
||||
return default(Transfer);
|
||||
|
||||
return Utility.Deserialize<Transfer>(MessageData);
|
||||
|
||||
return Utility.Deserialize<T>(MessageData);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
67
Messages/Transfer.cs
Normal file
67
Messages/Transfer.cs
Normal file
@@ -0,0 +1,67 @@
|
||||
using ProtoBuf;
|
||||
using Sandbox;
|
||||
using Sandbox.Engine.Multiplayer;
|
||||
using Sandbox.Engine.Networking;
|
||||
using Sandbox.Game.Entities;
|
||||
using Sandbox.Game.Gui;
|
||||
using Sandbox.Game.Multiplayer;
|
||||
using Sandbox.Game.World;
|
||||
using Sandbox.Graphics.GUI;
|
||||
using Sandbox.ModAPI;
|
||||
using SeamlessClientPlugin.ClientMessages;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using VRage;
|
||||
using VRage.Game;
|
||||
using VRage.GameServices;
|
||||
using VRage.Network;
|
||||
using VRage.Steam;
|
||||
using VRage.Utils;
|
||||
using VRageMath;
|
||||
|
||||
namespace SeamlessClientPlugin.SeamlessTransfer
|
||||
{
|
||||
|
||||
[ProtoContract]
|
||||
public class Transfer
|
||||
{
|
||||
[ProtoMember(1)]
|
||||
public ulong TargetServerID;
|
||||
[ProtoMember(2)]
|
||||
public string IPAdress;
|
||||
[ProtoMember(6)]
|
||||
public WorldRequest WorldRequest;
|
||||
[ProtoMember(7)]
|
||||
public string PlayerName;
|
||||
|
||||
[ProtoMember(8)]
|
||||
public List<MyObjectBuilder_Gps.Entry> PlayerGPSCoords;
|
||||
|
||||
[ProtoMember(9)]
|
||||
public MyObjectBuilder_Toolbar PlayerToolbar;
|
||||
|
||||
public List<Vector3> PlayerBuildSlots;
|
||||
|
||||
public Transfer(ulong ServerID, string IPAdress)
|
||||
{
|
||||
/* This is only called serverside
|
||||
*/
|
||||
|
||||
this.IPAdress = IPAdress;
|
||||
TargetServerID = ServerID;
|
||||
}
|
||||
|
||||
public Transfer() { }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user