Fix RemoteTechnologiesGroup#729 issue

KSP-TaxiService · KSP-TaxiService · commit 66f5f2654696 · 2017-06-25T21:59:17.000+08:00
diff --git a/src/RemoteTech/FlightComputer/Commands/ManeuverCommand.cs b/src/RemoteTech/FlightComputer/Commands/ManeuverCommand.cs
@@ -46,13 +46,22 @@ public override string Description
 
         public override bool Pop(FlightComputer f)
         {
+            if(f.Vessel.patchedConicSolver == null)
+            {
+                f.Vessel.AttachPatchedConicsSolver();
+                f.Vessel.patchedConicSolver.Update();
+            }
+
             // check if the stored node is still valid
-            if (f.Vessel.patchedConicSolver.maneuverNodes.IndexOf(this.Node) < 0)
+            if (f.Vessel.patchedConicSolver.maneuverNodes.FindIndex(x => x.UT == this.Node.UT && x.DeltaV == this.Node.DeltaV) < 0)//IndexOf() is bad comparer
             {
                 RTUtil.ScreenMessage("[Flight Computer]: No maneuver node found.");
                 return false;
             }
 
+            if (this.Node.solver == null) // need to repair (due to the scenario of 2 vessels within phyical range)
+                this.Node = f.Vessel.patchedConicSolver.maneuverNodes.Find(x => x.UT == this.Node.UT && x.DeltaV == this.Node.DeltaV);
+
             var burn = f.ActiveCommands.FirstOrDefault(c => c is BurnCommand);
             if (burn != null) {
                 f.Remove (burn);
@@ -92,7 +101,7 @@ private void AbortManeuver(FlightComputer computer)
             RTUtil.ScreenMessage("[Flight Computer]: Maneuver node removed");
             if (computer.Vessel.patchedConicSolver != null)
             {
-                Node.RemoveSelf();
+                this.Node.RemoveSelf();
             }
 
             // Flight Computer mode after execution based on settings
@@ -246,13 +255,22 @@ public static ManeuverCommand WithNode(int nodeIndex, FlightComputer f)
         /// <returns>true - loaded successfull</returns>
         public override bool Load(ConfigNode n, FlightComputer fc)
         {
+            //Additional notes: Load() is never called when cold-launching KSP and resuming flight.
             if(base.Load(n,fc))
             {
                 if(n.HasValue("NodeIndex"))
                 {
                     this.NodeIndex = int.Parse(n.GetValue("NodeIndex"));
-                    RTLog.Notify("Trying to get Maneuver {0}", this.NodeIndex);
-                    if (this.NodeIndex >= 0)
+
+                    if (fc.Vessel.patchedConicSolver == null)
+                    {
+                        fc.Vessel.AttachPatchedConicsSolver();
+                        fc.Vessel.patchedConicSolver.Update();
+                    }
+
+                    RTLog.Notify("Trying to get Maneuver {0} in the list of {1} maneuver nodes", this.NodeIndex, fc.Vessel.patchedConicSolver.maneuverNodes.Count);
+
+                    if (this.NodeIndex >= 0 && fc.Vessel.patchedConicSolver.maneuverNodes.Count > 0)
                     {
                         // Set the ManeuverNode into this command
                         this.Node = fc.Vessel.patchedConicSolver.maneuverNodes[this.NodeIndex];
@@ -271,8 +289,14 @@ public override bool Load(ConfigNode n, FlightComputer fc)
         /// </summary>
         public override void Save(ConfigNode n, FlightComputer fc)
         {
+            if (fc.Vessel.patchedConicSolver == null)
+            {
+                fc.Vessel.AttachPatchedConicsSolver();
+                fc.Vessel.patchedConicSolver.Update();
+            }
+
             // search the node on the List
-            this.NodeIndex = fc.Vessel.patchedConicSolver.maneuverNodes.IndexOf(this.Node);
+            this.NodeIndex = fc.Vessel.patchedConicSolver.maneuverNodes.FindIndex(x => x.UT == this.Node.UT && x.DeltaV == this.Node.DeltaV);
 
             // only save this command if we are on the maneuverNode list
             if (this.NodeIndex >= 0)
diff --git a/src/RemoteTech/FlightComputer/FlightCore.cs b/src/RemoteTech/FlightComputer/FlightCore.cs
@@ -37,6 +37,13 @@ public static void HoldAttitude(FlightCtrlState fs, FlightComputer f, ReferenceF
 
                 case ReferenceFrame.Maneuver:
                     ignoreRoll = true;
+
+                    if (f.Vessel.patchedConicSolver == null)//scenario: two vessels within physical range with FC attitude hold cmds. Unloaded one doesn't have solver instance
+                    {
+                        f.Vessel.AttachPatchedConicsSolver();
+                        f.Vessel.patchedConicSolver.Update();
+                    }
+
                     if (f.Vessel.patchedConicSolver.maneuverNodes.Count != 0)
                     {
                         forward = f.Vessel.patchedConicSolver.maneuverNodes[0].GetBurnVector(v.orbit);
