Core/Spells: Drop EFFECT_IMPLICIT_TARGET_PET and use EFFECT_IMPLICIT_TARGET_EXPLICIT instead.
This commit is contained in:
1 parent
71bbbaa21b
commit
d01a761f53
4 files changed
+31
-31
No files matched your search
@@ -844,12 +844,6 @@ void Spell::SelectEffectTypeImplicitTargets(uint8 effIndex)
|
||||
if (targetMask & TARGET_FLAG_UNIT_MASK)
|
||||
AddUnitTarget(m_caster, 1 << effIndex, false);
|
||||
break;
|
||||
// for EFFECT_LEARN_PET_SPELL - maybe should add unitTarget's pet instead of caster's?
|
||||
case EFFECT_IMPLICIT_TARGET_PET:
|
||||
if (targetMask & TARGET_FLAG_UNIT_MASK)
|
||||
if (Guardian* pet = m_caster->GetGuardianPet())
|
||||
AddUnitTarget(pet, 1 << effIndex, false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4950,21 +4944,24 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||
}
|
||||
case SPELL_EFFECT_LEARN_PET_SPELL:
|
||||
{
|
||||
if (m_caster->GetTypeId() != TYPEID_PLAYER)
|
||||
return SPELL_FAILED_BAD_TARGETS;
|
||||
// check target only for unit target case
|
||||
if (Unit* unitTarget = m_targets.GetUnitTarget())
|
||||
{
|
||||
if (m_caster->GetTypeId() != TYPEID_PLAYER)
|
||||
return SPELL_FAILED_BAD_TARGETS;
|
||||
|
||||
Pet* pet = m_caster->ToPlayer()->GetPet();
|
||||
if (!pet)
|
||||
return SPELL_FAILED_NO_PET;
|
||||
Pet* pet = unitTarget->ToPet();
|
||||
if (!pet || pet->GetOwner() != m_caster)
|
||||
return SPELL_FAILED_BAD_TARGETS;
|
||||
|
||||
SpellInfo const* learn_spellproto = sSpellMgr->GetSpellInfo(m_spellInfo->Effects[i].TriggerSpell);
|
||||
SpellInfo const* learn_spellproto = sSpellMgr->GetSpellInfo(m_spellInfo->Effects[i].TriggerSpell);
|
||||
|
||||
if (!learn_spellproto)
|
||||
return SPELL_FAILED_NOT_KNOWN;
|
||||
|
||||
if (m_spellInfo->SpellLevel > pet->getLevel())
|
||||
return SPELL_FAILED_LOWLEVEL;
|
||||
if (!learn_spellproto)
|
||||
return SPELL_FAILED_NOT_KNOWN;
|
||||
|
||||
if (m_spellInfo->SpellLevel > pet->getLevel())
|
||||
return SPELL_FAILED_LOWLEVEL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SPELL_EFFECT_APPLY_GLYPH:
|
||||
|
||||
Reference in new issue
Block a user