aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2015-09-09 08:37:03 -0700
committerCarbenium <carbenium@outlook.com>2015-09-25 00:03:23 +0200
commiteb65c8051c9a2e1371fb18bdb67074433cf61721 (patch)
tree7e9e756cd1740430d9077140f9dcf67c2d87d28a
parent7893ac6baf3407bcc7dc6d32215677699713e672 (diff)
Merge pull request #15452 from Treeston/3.3.5
Core/Unit: Allow mounting for certain transformations (cherry picked from commit 6cdfe9dc095bd19ea495c22cb41cd82f1212b6cd)
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4132e6e0330..c8db3a07573 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11251,6 +11251,10 @@ bool Unit::IsInFeralForm() const
bool Unit::IsInDisallowedMountForm() const
{
+ if (SpellInfo const* transformSpellInfo = sSpellMgr->GetSpellInfo(getTransForm()))
+ if (transformSpellInfo->HasAttribute(SPELL_ATTR0_CASTABLE_WHILE_MOUNTED))
+ return false;
+
if (ShapeshiftForm form = GetShapeshiftForm())
{
SpellShapeshiftFormEntry const* shapeshift = sSpellShapeshiftFormStore.LookupEntry(form);