diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-03-17 12:35:10 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2020-04-24 17:18:48 +0200 |
| commit | c16cebca64dfb82e6abcf1eba3a621d84125a26d (patch) | |
| tree | dd1961a4b0bb3c2ed98bff68c137944c33533f25 | |
| parent | dbb21ea8442ff4edd234b06885f50748032cfea5 (diff) | |
Core/Unit: properly reset displayIds when having a shapeshift aura active
Closes #19309
(cherry picked from commit 7a38eaa5a1fe23d8fedb2bfce518abb972b823f7)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 8de9a90ac44..93851c40920 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10782,7 +10782,10 @@ void Unit::RestoreDisplayId(bool ignorePositiveAurasPreventingMounting /*= false // transform aura was found if (handledAura) + { handledAura->HandleEffect(this, AURA_EFFECT_HANDLE_SEND_FOR_CLIENT, true); + return; + } // we've found shapeshift else if (!shapeshiftAura.empty()) // we've found shapeshift { @@ -10793,11 +10796,11 @@ void Unit::RestoreDisplayId(bool ignorePositiveAurasPreventingMounting /*= false SetDisplayId(modelId); else SetDisplayId(GetNativeDisplayId()); + return; } } // no auras found - set modelid to default - else - SetDisplayId(GetNativeDisplayId()); + SetDisplayId(GetNativeDisplayId()); } void Unit::ClearAllReactives() |