diff --git a/Messages/Transfer.cs b/Messages/Transfer.cs index 52596d9..5adc445 100644 --- a/Messages/Transfer.cs +++ b/Messages/Transfer.cs @@ -38,10 +38,6 @@ namespace SeamlessClientPlugin.Messages public WorldRequest WorldRequest; [ProtoMember(7)] public string PlayerName; - - [ProtoMember(8)] - public List PlayerGPSCoords; - [ProtoMember(9)] public MyObjectBuilder_Toolbar PlayerToolbar; diff --git a/Messages/WorldRequest.cs b/Messages/WorldRequest.cs index 6d044de..fa37ee3 100644 --- a/Messages/WorldRequest.cs +++ b/Messages/WorldRequest.cs @@ -27,6 +27,9 @@ namespace SeamlessClientPlugin.Messages [ProtoMember(4)] public byte[] WorldData; + [ProtoMember(5)] + public MyObjectBuilder_Gps gpsCollection; + public WorldRequest(ulong PlayerID,long PlayerIdentity, string Name) { this.PlayerID = PlayerID; @@ -58,6 +61,10 @@ namespace SeamlessClientPlugin.Messages public MyObjectBuilder_World DeserializeWorldData() { MyObjectBuilderSerializer.DeserializeGZippedXML(new MemoryStream(WorldData), out var objectBuilder); + objectBuilder.Checkpoint.Gps.Dictionary.Add(IdentityID, gpsCollection); + + + return objectBuilder; } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 026e8f1..1f30f4a 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.0")] -[assembly: AssemblyFileVersion("1.4.0.0")] +[assembly: AssemblyVersion("1.4.01.0")] +[assembly: AssemblyFileVersion("1.4.01.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/SeamlessClient.cs b/SeamlessClient.cs index b5a6359..0213d2f 100644 --- a/SeamlessClient.cs +++ b/SeamlessClient.cs @@ -110,7 +110,7 @@ namespace SeamlessClientPlugin - public static string Version = "1.3.04"; + public static string Version = "1.4.01"; public static bool Debug = true; private static bool Initilized = false; diff --git a/SeamlessTransfer/PingServer.cs b/SeamlessTransfer/PingServer.cs index aeed111..74ac5c9 100644 --- a/SeamlessTransfer/PingServer.cs +++ b/SeamlessTransfer/PingServer.cs @@ -40,9 +40,11 @@ namespace SeamlessClientPlugin.SeamlessTransfer SeamlessClient.TryShow("Beginning Redirect to server: " + Transfer.TargetServerID); + + var world = Request.DeserializeWorldData(); - SwitchServers Switcher = new SwitchServers(E, Request.DeserializeWorldData()); + SwitchServers Switcher = new SwitchServers(E, world); Switcher.BeginSwitch(); } }