aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNecropola <necropola@rain-fighters.net>2017-08-04 03:52:24 +0200
committerShauren <shauren.trinity@gmail.com>2020-08-22 13:55:11 +0200
commit885e172f4d29710a47f003c58b4d9c24edf8cc8a (patch)
tree96fb571906d29e02aac4ef0d9dabea7e87afd4ec /src
parentd5a9461e261f5af561feb21667bc9980ead2c721 (diff)
[3.3.5] Core/Pet: Make pet action bar autocast persist properly (#20110)
Partial revert of of 6c21ddd9b98d372cb802c9abf034e2aa3ecc70b9. Closes #16211. (cherry picked from commit 906498e9f4d80ff10094cd3f365b310d9dec4521)
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/server/game/Entities/Pet/Pet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 85a80472ebd..e0669360574 100644..100755
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -1529,7 +1529,7 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
}
// if remove last rank or non-ranked then update action bar at server and client if need
- if (m_charmInfo->RemoveSpellFromActionBar(spell_id) && !learn_prev && clear_ab)
+ if (clear_ab && !learn_prev && m_charmInfo->RemoveSpellFromActionBar(spell_id))
{
if (!m_loading)
GetOwner()->PetSpellInitialize(); // need update action bar for last removed rank