diff options
| author | StormBytePP <stormbyte@gmail.com> | 2015-08-27 00:39:14 +0200 |
|---|---|---|
| committer | StormBytePP <stormbyte@gmail.com> | 2015-08-27 00:39:14 +0200 |
| commit | 4c420344fc4c8508b2142a5031d9bf8b16c0e7fd (patch) | |
| tree | 1018f8133921d4d46616a8e7ca5c4a0d2a118043 | |
| parent | c67118f909fee1ed489e3125cb85f3a8179c1a43 (diff) | |
| parent | 70f029fd0abf28ce7d1b2c0abc3db7a541d8c448 (diff) | |
Merge pull request #15347 from StormBytePP/3.3.5_fix_dismounting_when_over_water
Core/Unit: Do not remove aura with interrupt flag AURA_INTERRUPT_FLAG_NOT_UNDERWATER when already flying
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4597f18eedb..fdfa62ea78e 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3192,7 +3192,7 @@ bool Unit::IsUnderWater() const void Unit::UpdateUnderwaterState(Map* m, float x, float y, float z) { - if (!IsPet() && !IsVehicle()) + if (IsFlying() || (!IsPet() && !IsVehicle())) return; LiquidData liquid_status; |