Core/Unit: Fix movement hiccups in water

Port From (https://github.com/TrinityCore/TrinityCore/commit/6b242eee130f1ac405187a03cefaf595d857ad99)
2022-05-24 18:20:46 -04:00
parent 5b76bfe10d
commit a89977ad99
7 changed files with 52 additions and 5 deletions
@@ -74,6 +74,9 @@ namespace Game.AI

            if (movementInform && HasFlag(MovementGeneratorFlags.InformEnabled))
            {
+                if (!owner.HasSwimmingFlagOutOfCombat())
+                    owner.RemoveUnitFlag(UnitFlags.CanSwim);
+
                owner.SetSpawnHealth();
                owner.LoadCreaturesAddon();
                if (owner.IsVehicle())
@@ -868,7 +868,7 @@ namespace Game.Movement
                    includeFlags |= NavTerrainFlag.Ground;

                // creatures don't take environmental damage
-                if (creature.CanSwim())
+                if (creature.CanEnterWater())
                    includeFlags |= (NavTerrainFlag.Water | NavTerrainFlag.MagmaSlime);
            }
            else