diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-02-04 18:00:04 -0800 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-02-04 18:00:04 -0800 |
| commit | 8ec7e787f6f4e99f9824d416f12a345333702db9 (patch) | |
| tree | 806a8b25109ec7ba7e310d79551f76cc3fd2b352 /src | |
| parent | 83c0b73efd96d6d006f342f59cd8ecb7b6af580a (diff) | |
| parent | e13eec514122299e31f718be8c47021409f12096 (diff) | |
Merge pull request #5060 from Souler/fix_argent_tournament_spells
[Bug/Fix] Warriors and tournament mounts
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)) { |