josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore

Browse Source
This commit is contained in:
Subv2112
2012-02-04 21:22:11 -05:00
parent 31615bdc86 8ec7e787f6
commit 3b10122c13
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Spells/spell_generic.cpp
+2 -5
View File
@@ -2041,11 +2041,8 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader
SpellCastResult CheckIfLanceEquiped() SpellCastResult CheckIfLanceEquiped()
{ {
if (GetCaster()->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) if (GetCaster()->IsInDisallowedMountForm())
{ GetCaster()->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
SetCustomCastResultMessage(SPELL_CUSTOM_ERROR_CANT_MOUNT_WITH_SHAPESHIFT);
return SPELL_FAILED_CUSTOM_ERROR;
}
if (!GetCaster()->HasAura(SPELL_LANCE_EQUIPPED)) if (!GetCaster()->HasAura(SPELL_LANCE_EQUIPPED))
{ {