(b8fa3b004) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs

@@ -1084,6 +1084,8 @@ namespace Barotrauma
 
         private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
 
+        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
+
         //goes through all the AItargets, evaluates how preferable it is to attack the target,
         //whether the Character can see/hear the target and chooses the most preferable target within
         //sight/hearing range

Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs

@@ -306,12 +306,12 @@ namespace Barotrauma
 
         public override void OnAttacked(Character attacker, AttackResult attackResult)
         {
-            // Damage from falling etc.
-            if (Character.LastDamageSource == null) { return; }
             float damage = attackResult.Damage;
             if (damage <= 0) { return; }
             if (attacker == null || attacker.IsDead || attacker.Removed)
             {
+                // Ignore damage from falling etc that we shouldn't react to.
+                if (Character.LastDamageSource == null) { return; }
                 AddCombatObjective(AIObjectiveCombat.CombatMode.Retreat, Rand.Range(0.5f, 1f, Rand.RandSync.Unsynced));
             }
             else if (IsFriendly(attacker))

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -2666,6 +2666,10 @@ namespace Barotrauma
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif
 
+#if CLIENT
+            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
+#endif
+
 #if CLIENT
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif