diff options
| author | maximius <none@none> | 2009-09-28 15:48:03 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-28 15:48:03 -0700 |
| commit | 0a9addd224076f0a555535b6b08a342f61d056c8 (patch) | |
| tree | cfbd874eac6e54c701152e9c67712797df07d7f8 /src/game/Unit.cpp | |
| parent | daa9b62ec709bf741448dd375403f83cc11bc023 (diff) | |
*Attempt to fix a crash, and sanitize some input.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index a9faa5e72d8..1406a048b3a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11356,9 +11356,9 @@ 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(canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER + if((*itr) && canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER && !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN) - && (!(*itr)->getVictim() || !(*itr)->isAttackingPlayer() || IsFriendlyTo(target->getVictim()))) // if the victim of target is a player, only defend the victim if we are friendly + && (!(*itr)->getVictim() || !(*itr)->isAttackingPlayer() || IsFriendlyTo((*itr)->getVictim()))) // if the victim of target is a player, only defend the victim if we are friendly return NULL; } |