From 9bbb4ef5830cbe3bf94e9e1e6ad4cac4c45be2fa Mon Sep 17 00:00:00 2001 From: QAston Date: Fri, 16 Sep 2011 22:17:20 +0200 Subject: Core/Spells: Use Unit::IsValidAttack/AssistTarget functions to validate spell explicit targets. --- src/server/game/Spells/SpellInfo.cpp | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'src/server/game/Spells/SpellInfo.cpp') diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index f259b130a5d..d880b9524b2 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1634,7 +1634,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, Unit const* target, b if (!(AttributesEx6 & SPELL_ATTR6_CAN_TARGET_INVISIBLE) && !caster->canSeeOrDetect(target, implicit)) return SPELL_FAILED_BAD_TARGETS; - // TODO: more research + // checked in Unit::IsValidAttack/AssistTarget, shouldn't be checked for ENTRY targets //if (!(AttributesEx6 & SPELL_ATTR6_CAN_TARGET_UNTARGETABLE) && target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) // return SPELL_FAILED_BAD_TARGETS; @@ -1648,14 +1648,6 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, Unit const* target, b return SPELL_FAILED_BAD_TARGETS; } - // check UNIT_FLAG_NON_ATTACKABLE flag - a player can cast spells on his pet (or other controlled unit) though in any state - if (!IsPositive() && target != caster && target->GetCharmerOrOwnerGUID() != caster->GetGUID()) - { - // any unattackable target skipped - if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return SPELL_FAILED_BAD_TARGETS; - } - // check GM mode and GM invisibility - only for player casts (npc casts are controlled by AI) and negative spells if (target != caster && (caster->IsControlledByPlayer() || !IsPositive()) && target->GetTypeId() == TYPEID_PLAYER) { @@ -1738,17 +1730,13 @@ SpellCastResult SpellInfo::CheckExplicitTarget(Unit const* caster, WorldObject c if (neededTargets & (TARGET_FLAG_UNIT_ENEMY | TARGET_FLAG_UNIT_ALLY | TARGET_FLAG_UNIT_RAID | TARGET_FLAG_UNIT_PARTY | TARGET_FLAG_UNIT_MINIPET | TARGET_FLAG_UNIT_PASSENGER)) { if (neededTargets & TARGET_FLAG_UNIT_ENEMY) - if (!caster->IsFriendlyTo(unitTarget)) - return SPELL_CAST_OK; - if (neededTargets & TARGET_FLAG_UNIT_ALLY) - if (caster->IsFriendlyTo(unitTarget)) - return SPELL_CAST_OK; - if (neededTargets & TARGET_FLAG_UNIT_PARTY) - if (caster->IsInPartyWith(unitTarget)) - return SPELL_CAST_OK; - if (neededTargets & TARGET_FLAG_UNIT_RAID) - if (caster->IsInRaidWith(unitTarget)) + if (caster->_IsValidAttackTarget(unitTarget, this)) return SPELL_CAST_OK; + if (neededTargets & TARGET_FLAG_UNIT_ALLY + || (neededTargets & TARGET_FLAG_UNIT_PARTY && caster->IsInPartyWith(unitTarget)) + || (neededTargets & TARGET_FLAG_UNIT_RAID && caster->IsInRaidWith(unitTarget))) + if (caster->_IsValidAssistTarget(unitTarget, this)) + return SPELL_CAST_OK; if (neededTargets & TARGET_FLAG_UNIT_MINIPET) if (unitTarget->GetGUID() == caster->GetCritterGUID()) return SPELL_CAST_OK; -- cgit v1.2.3