diff options
| author | Subv2112 <s.v.h21@hotmail.com> | 2012-02-04 21:22:11 -0500 |
|---|---|---|
| committer | Subv2112 <s.v.h21@hotmail.com> | 2012-02-04 21:22:11 -0500 |
| commit | 3b10122c1324a48bacca06771df378b2c1ea953a (patch) | |
| tree | 5cbdae867a0d7476cb68f34dab1f3a992262eb1b /src | |
| parent | 31615bdc8674b0ec58e8bed44d4d65520a157d17 (diff) | |
| parent | 8ec7e787f6f4e99f9824d416f12a345333702db9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 3d552901295..6fc93733a85 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2041,11 +2041,8 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader SpellCastResult CheckIfLanceEquiped() { - if (GetCaster()->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) - { - SetCustomCastResultMessage(SPELL_CUSTOM_ERROR_CANT_MOUNT_WITH_SHAPESHIFT); - return SPELL_FAILED_CUSTOM_ERROR; - } + if (GetCaster()->IsInDisallowedMountForm()) + GetCaster()->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT); if (!GetCaster()->HasAura(SPELL_LANCE_EQUIPPED)) { |