Skip to content

Commit 41cb413

Browse files
authored
Merge pull request #13 from Falki-git/main
Fix NullRef when Target doesn't have an Orbit component
2 parents f01f63d + 26b36c9 commit 41cb413

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

MicroEngineerProject/MicroEngineer/MicroEntries.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ public TargetApoapsis()
832832

833833
public override void RefreshData()
834834
{
835-
EntryValue = MicroUtility.ActiveVessel.TargetObject?.Orbit.ApoapsisArl;
835+
EntryValue = MicroUtility.ActiveVessel.TargetObject?.Orbit?.ApoapsisArl;
836836
}
837837

838838
public override string ValueDisplay
@@ -860,7 +860,7 @@ public TargetPeriapsis()
860860

861861
public override void RefreshData()
862862
{
863-
EntryValue = MicroUtility.ActiveVessel.TargetObject?.Orbit.PeriapsisArl;
863+
EntryValue = MicroUtility.ActiveVessel.TargetObject?.Orbit?.PeriapsisArl;
864864
}
865865

866866
public override string ValueDisplay
@@ -888,7 +888,7 @@ public DistanceToTarget()
888888

889889
public override void RefreshData()
890890
{
891-
EntryValue = MicroUtility.ActiveVessel.TargetObject != null ? (MicroUtility.ActiveVessel.Orbit.Position - MicroUtility.ActiveVessel.TargetObject.Orbit.Position).magnitude : null;
891+
EntryValue = MicroUtility.ActiveVessel.TargetObject?.Orbit != null ? (MicroUtility.ActiveVessel.Orbit.Position - MicroUtility.ActiveVessel.TargetObject.Orbit.Position).magnitude : null;
892892
}
893893

894894
public override string ValueDisplay
@@ -918,7 +918,7 @@ public RelativeSpeed()
918918

919919
public override void RefreshData()
920920
{
921-
EntryValue = MicroUtility.ActiveVessel.TargetObject != null ? (MicroUtility.ActiveVessel.Orbit.relativeVelocity - MicroUtility.ActiveVessel.TargetObject.Orbit.relativeVelocity).magnitude : null;
921+
EntryValue = MicroUtility.ActiveVessel.TargetObject?.Orbit != null ? (MicroUtility.ActiveVessel.Orbit.relativeVelocity - MicroUtility.ActiveVessel.TargetObject.Orbit.relativeVelocity).magnitude : null;
922922
}
923923

924924
public override string ValueDisplay
@@ -961,7 +961,7 @@ public override string ValueDisplay
961961
return "-";
962962

963963
// return value only if vessel and target are in the same SOI
964-
if (MicroUtility.ActiveVessel.Orbit.referenceBody != MicroUtility.ActiveVessel.TargetObject?.Orbit.referenceBody)
964+
if (MicroUtility.ActiveVessel.Orbit.referenceBody != MicroUtility.ActiveVessel.TargetObject?.Orbit?.referenceBody)
965965
return "-";
966966

967967
return String.IsNullOrEmpty(base.Formatting) ? EntryValue.ToString() : String.Format(base.Formatting, EntryValue);

0 commit comments

Comments
 (0)