Fix the startup of the warping system. Closes #6

LunaMultiplayer · Oct 31, 2016 · 14d271b · 14d271b
1 parent 719f644
commit 14d271b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Client/Systems/Warp/WarpMessageHandler.cs b/Client/Systems/Warp/WarpMessageHandler.cs
@@ -46,6 +46,7 @@ public void HandleMessage(IMessageData messageData)
                         AddSubspace(-1, 0);//Add warping subspace
 
                         //Set us into server subspace
+                        System.SkipSubspaceProcess = true;
                         System.CurrentSubspace = 0;
 
                         MainSystem.Singleton.NetworkState = ClientState.WARPSUBSPACES_SYNCED;

diff --git a/Client/Systems/Warp/WarpSystem.cs b/Client/Systems/Warp/WarpSystem.cs
@@ -22,8 +22,7 @@ public class WarpSystem : MessageSystem<WarpSystem, WarpMessageSender, WarpMessa
 
         public WarpEntryDisplay WarpEntryDisplay { get; } = new WarpEntryDisplay();
 
-        private int _currentSubspace;
-
+        private int _currentSubspace = int.MinValue;
         public int CurrentSubspace
         {
             get { return _currentSubspace; }
@@ -67,6 +66,7 @@ public override void OnDisabled()
             GameEvents.onTimeWarpRateChanged.Remove(WarpEvents.OnTimeWarpChanged);
             ClientSubspaceList.Clear();
             Subspaces.Clear();
+            _currentSubspace = int.MinValue;
         }
 
         public override void OnEnabled()