Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-16 22:59:24 -06:00
parent 11239e9f5f 0a1c601a1c
commit fa2e6622ad
12 changed files with 146 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/game/Unit.cpp
View File

@@ -8570,23 +8570,12 @@ void Unit::CombatStart(Unit* target)
if(!target->IsStandState()/* && !target->hasUnitState(UNIT_STAT_STUNNED)*/)
target->SetStandState(PLAYER_STATE_NONE);
//Call creature group update
if(GetTypeId()==TYPEID_UNIT && ((Creature *)this)->GetFormationID() &&
CreatureGroupHolder.find(((Creature *)this)->GetFormationID()) != CreatureGroupHolder.end())
CreatureGroupHolder[((Creature *)this)->GetFormationID()]->MemberHasAttacked(((Creature *)this));
if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER
&& !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->AI())
{
SetInCombatWith(target);
target->SetInCombatWith(this);
((Creature*)target)->AI()->AttackStart(this);
}
else
{
SetInCombatWith(target);
target->SetInCombatWith(this);
}
SetInCombatWith(target);
target->SetInCombatWith(this);
Unit *who = target->GetCharmerOrOwnerOrSelf();
if(who->GetTypeId() == TYPEID_PLAYER)
@@ -8600,6 +8589,14 @@ void Unit::CombatStart(Unit* target)
me->UpdatePvP(true);
me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
}
//Call creature group update
if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->GetFormationID())
{
CreatureGroupHolderType::iterator itr = CreatureGroupHolder.find(((Creature*)this)->GetFormationID());
if(itr != CreatureGroupHolder.end())
itr->second->MemberHasAttacked(((Creature*)this));
}
}
void Unit::SetInCombatState(bool PvP)
@@ -9297,12 +9294,15 @@ bool Unit::SelectHostilTarget()
}
// search nearby enemy before enter evade mode
if(Unit *target = ((Creature*)this)->SelectNearestTarget())
if(((Creature*)this)->HasReactState(REACT_AGGRESSIVE))
{
if(!((Creature*)this)->IsOutOfThreatArea(target))
if(Unit *target = ((Creature*)this)->SelectNearestTarget())
{
((Creature*)this)->AI()->AttackStart(target);
return true;
if(!((Creature*)this)->IsOutOfThreatArea(target))
{
((Creature*)this)->AI()->AttackStart(target);
return true;
}
}
}