aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-05-05 19:27:28 -0300
committerfunjoker <funjoker109@gmail.com>2020-06-14 20:09:45 +0200
commit3698f3a26203be05480b1673d1595e52e2534445 (patch)
tree4912b1d237801468f357838ee08eafcbf0361144 /src
parente21e7cd2e26361d18d57a7c4ec002dbf0abe8ffc (diff)
Core/Entities: allow guardian pets to inherit spellmods
(cherry picked from commit 97e608b05302818170ab8ada03077b8dafc55af9)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 29f2d6433ce..bcafc09ed2b 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10616,13 +10616,13 @@ Player* Unit::GetSpellModOwner() const
if (Player* player = const_cast<Unit*>(this)->ToPlayer())
return player;
- if (IsPet() || IsTotem())
+ if (HasUnitTypeMask(UNIT_MASK_PET | UNIT_MASK_TOTEM | UNIT_MASK_GUARDIAN))
{
if (Unit* owner = GetOwner())
if (Player* player = owner->ToPlayer())
return player;
}
- return NULL;
+ return nullptr;
}
///----------Pet responses methods-----------------