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

Update to creature formations.

Browse Source 
This is a big merge, it may cause problems. Use with caution, report bugs.

--HG--
branch : trunk
This commit is contained in:
raczman
2009-04-15 15:46:02 +02:00
parent c97a4519c5
commit 4fb720c7d1
8 changed files with 204 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/Unit.cpp
View File

@@ -9496,7 +9496,14 @@ void Unit::CombatStart(Unit* target)
if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER
&& !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->IsAIEnabled)
{
((Creature*)target)->AI()->AttackStart(this);
if(((Creature*)target)->GetFormation())
{
((Creature*)target)->GetFormation()->MemberAttackStart((Creature*)target, this);
sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
}
}
SetInCombatWith(target);
target->SetInCombatWith(this);
@@ -9514,13 +9521,6 @@ void Unit::CombatStart(Unit* target)
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)