Release 1.10.5.0 - Autumn Update 2025

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/GoToMission.cs

@@ -2,7 +2,10 @@
 {
     partial class GoToMission : Mission
     {
-        public override bool DisplayAsCompleted => State >= Prefab.MaxProgressState;
+        public override bool DisplayAsCompleted => 
+            State >= Prefab.MaxProgressState && 
+            //if there's some additional check for completion, don't display as completed until we've checked it and set the mission as completed
+            (Completed || completeCheckDataAction == null);
         public override bool DisplayAsFailed => false;
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/SalvageMission.cs

@@ -139,6 +139,8 @@ namespace Barotrauma
             }
         }
 
-        public override IEnumerable<Entity> HudIconTargets => targets.Where(static t => !t.Retrieved && t.Item?.GetRootInventoryOwner() is not Character { IsLocalPlayer: true }).Select(static t => t.Item);
+        public override IEnumerable<Entity> HudIconTargets => targets
+            .Where(static t => t.Item != null && !t.Retrieved && t.Item?.GetRootInventoryOwner() is not Character { IsLocalPlayer: true })
+            .Select(static t => t.Item);
     }
 }