mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7697] Interrupt casting at enter to evade mode.

Browse source
This commit is contained in:
VladimirMangos 2009-04-22 18:01:29 +04:00
parent cc83cac0aa
commit d910610600
9 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/Unit.cpp
View file

@ -7214,9 +7214,9 @@ bool Unit::AttackStop(bool targetSwitch /*=false*/)
return true;
}
void Unit::CombatStop(bool cast)
void Unit::CombatStop(bool includingCast)
{
if (cast && IsNonMeleeSpellCasted(false))
if (includingCast && IsNonMeleeSpellCasted(false))
InterruptNonMeleeSpells(false);
AttackStop();
@ -7226,19 +7226,19 @@ void Unit::CombatStop(bool cast)
ClearInCombat();
}
void Unit::CombatStopWithPets(bool cast)
void Unit::CombatStopWithPets(bool includingCast)
{
CombatStop(cast);
CombatStop(includingCast);
if(Pet* pet = GetPet())
pet->CombatStop(cast);
pet->CombatStop(includingCast);
if(Unit* charm = GetCharm())
charm->CombatStop(cast);
charm->CombatStop(includingCast);
if(GetTypeId()==TYPEID_PLAYER)
{
GuardianPetList const& guardians = ((Player*)this)->GetGuardians();
for(GuardianPetList::const_iterator itr = guardians.begin(); itr != guardians.end(); ++itr)
if(Unit* guardian = Unit::GetUnit(*this,*itr))
guardian->CombatStop(cast);
guardian->CombatStop(includingCast);
}
}