Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Some cleanup, change some illogical conditions (if you can attack your target is no reason to ignore the target, o_O)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-13 19:48:35 -07:00
parent c6b940a078
commit e490c33725
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Creature.cpp
View File

@@ -2233,7 +2233,7 @@ bool Creature::canCreatureAttack(Unit const *pVictim, bool force) const
if(!pVictim->isInAccessiblePlaceFor(this))
return false;
if(!AI()->CanAIAttack(pVictim))
if(IsAIEnabled && !AI()->CanAIAttack(pVictim))
return false;
if(sMapStore.LookupEntry(GetMapId())->IsDungeon())

2
src/game/Unit.cpp
View File

@@ -11368,7 +11368,7 @@ Unit* Creature::SelectVictim()
// Note: creature not have targeted movement generator but have attacker in this case
for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr)
{
if((*itr) && canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER
if((*itr) && !canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER
&& !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
return NULL;
}