(df7ca4c53) updated doors + merge fix

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

@@ -368,8 +368,6 @@ namespace Barotrauma
                 default:
                     throw new NotImplementedException();
             }
-            
-            SwarmBehavior?.Update(deltaTime);
 
             LatchOntoAI?.Update(this, deltaTime);
             IsSteeringThroughGap = false;
@@ -799,7 +797,6 @@ namespace Barotrauma
             {
                 UpdateLimbAttack(deltaTime, AttackingLimb, attackSimPos, distance);
             }
-            return false;
         }
 
         public bool IsSteeringThroughGap { get; private set; }

Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs

@@ -733,8 +733,6 @@ namespace Barotrauma
 
                 limb.body.ApplyForce(diff * (float)(Math.Sin(WalkPos) * Math.Sqrt(limb.Mass)) * 30.0f * animStrength, maxVelocity: 10.0f);
             }
-
-            limb?.body.SmoothRotate(angle, torque, wrapAngle: false);
         }
 
         private void SmoothRotateWithoutWrapping(Limb limb, float angle, Limb referenceLimb, float torque)