From eb65c8051c9a2e1371fb18bdb67074433cf61721 Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Wed, 9 Sep 2015 08:37:03 -0700 Subject: [PATCH] Merge pull request #15452 from Treeston/3.3.5 Core/Unit: Allow mounting for certain transformations (cherry picked from commit 6cdfe9dc095bd19ea495c22cb41cd82f1212b6cd) --- src/server/game/Entities/Unit/Unit.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4132e6e033..c8db3a0757 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);