aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStormBytePP <stormbyte@gmail.com>2015-08-24 16:00:38 +0200
committerCarbenium <carbenium@outlook.com>2015-09-24 23:27:19 +0200
commitbfdaee68ce590bc2849e84705e9be5879655dc26 (patch)
treea2f9b5f9f6e94c48a2f167f2b08e5f7e2ea6b23c
parentd0ce95fca5d3661a35ae500f3c57f676e459a926 (diff)
Core/Unit: Do not remove aura with interrupt flag AURA_INTERRUPT_FLAG_NOT_UNDERWATER when already flying
(cherry picked from commit 70f029fd0abf28ce7d1b2c0abc3db7a541d8c448)
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
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 ce669b77c59..4132e6e0330 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2971,7 +2971,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;