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

This commit is contained in:
Subv committed 2013-12-29 15:13:14 -05:00
commit d234d0f3d0
428 files changed
+4784 -4073

No files matched your search

+1 -1
View File
@@ -2280,7 +2280,7 @@ public:
// stop combat + make player unattackable + duel stop + stop some spells
player->setFaction(35);
player->CombatStop();
if (player->IsNonMeleeSpellCasted(true))
if (player->IsNonMeleeSpellCast(true))
player->InterruptNonMeleeSpells(true);
player->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);