diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 52d77a57c0..237b5852fe 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1704,7 +1704,7 @@ void Creature::setDeathState(DeathState s) if (m_formation && m_formation->getLeader() == this) m_formation->FormationReset(true); - if ((CanFly() || IsFlying())) + if ((CanFly() || IsFlying()) && !IsUnderWater()) GetMotionMaster()->MoveFall(); Unit::setDeathState(CORPSE); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3163b8c037..80f3f27649 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14077,9 +14077,15 @@ bool Unit::SetSwim(bool enable) return false; if (enable) + { AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); + SetDisableGravity(true); + } else + { RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING); + SetDisableGravity(false); + } if (enable) Movement::PacketSender(this, SMSG_SPLINE_MOVE_START_SWIM, NULL_OPCODE).Send();