diff options
| author | QAston <qaston@gmail.com> | 2011-09-16 23:49:31 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-09-16 23:49:31 +0200 |
| commit | c0b1823524b33d1ec7d07e8ed85c4a6dafa2be99 (patch) | |
| tree | 49779b65376f5a8d8c24c4c7aab3031e3a651222 /src/server/game/Entities/Unit | |
| parent | 3a3f2d927f6b40f27ad49b788629e2873180b64c (diff) | |
Core/Entities: Replace Unit::canAttack usage with more accurate Unit::IsValidAttackTarget
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6b1fa0fbaae..338210c440a 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12370,6 +12370,8 @@ bool Unit::IsValidAttackTarget(Unit const* target) const bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell) const { + ASSERT(target); + // can't attack self if (this == target) return false; @@ -12506,6 +12508,8 @@ bool Unit::IsValidAssistTarget(Unit const* target) const bool Unit::_IsValidAssistTarget(Unit const* target, SpellInfo const* bySpell) const { + ASSERT(target); + // can assist to self if (this == target) return true; @@ -13171,7 +13175,7 @@ Unit* Creature::SelectVictim() { --aura; caster = (*aura)->GetCaster(); - if (caster && canSeeOrDetect(caster, true) && canAttack(caster) && caster->isInAccessiblePlaceFor(ToCreature())) + if (caster && canSeeOrDetect(caster, true) && IsValidAttackTarget(caster) && caster->isInAccessiblePlaceFor(ToCreature())) { target = caster; break; |