aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2015-09-09 08:37:03 -0700
committerDuarte Duarte <dnpd.dd@gmail.com>2015-09-09 08:37:03 -0700
commit6cdfe9dc095bd19ea495c22cb41cd82f1212b6cd (patch)
tree0f62c95c65d10c377e9584d03ccda2ff1434e22f
parent556c413fcce78e4690f4ff405f88bdda99f113f7 (diff)
parentd42a4980631ddaf0a4dbf7f93ef87408c3238f84 (diff)
Merge pull request #15452 from Treeston/3.3.5
Core/Unit: Allow mounting for certain transformations
-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 d02a22d43f4..0978adc1814 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13171,6 +13171,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())
{
SpellShapeshiftEntry const* shapeshift = sSpellShapeshiftStore.LookupEntry(form);