diff options
4 files changed, 2 insertions, 49 deletions
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index db7442df3ca..000acd90fd6 100755 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -116,9 +116,6 @@ class CreatureAI : public UnitAI // Called when spell hits a target virtual void SpellHitTarget(Unit* /*target*/, SpellEntry const* /*spell*/) {} - // Called to get trigger target for aura effect - virtual Unit* GetAuraEffectTriggerTarget(uint32 /*spellId*/, uint8 /*effIndex*/) { return NULL; } - // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc) //virtual void AttackedBy(Unit* attacker); virtual bool IsEscorted() { return false; } diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 04211db8c6e..ac9b5155b33 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2149,22 +2149,12 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const } } -Unit* AuraEffect::GetTriggerTarget(Unit * target) const -{ - if (target->GetTypeId() == TYPEID_UNIT) - { - if (Unit * trigger = target->ToCreature()->AI()->GetAuraEffectTriggerTarget(GetId(), GetEffIndex())) - return trigger; - } - return target; -} - void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const { if (!caster || !target) return; - Unit* triggerTarget = GetTriggerTarget(target); + Unit* triggerTarget = target; // generic casting code with custom spells and target/caster customs uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[GetEffIndex()]; @@ -2468,7 +2458,7 @@ void AuraEffect::TriggerSpellWithValue(Unit * target, Unit * caster) const if (!caster || !target) return; - Unit* triggerTarget = GetTriggerTarget(target); + Unit* triggerTarget = target; uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[m_effIndex]; SpellEntry const *triggeredSpellInfo = sSpellStore.LookupEntry(triggerSpellId); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h index 68629d2044c..f8da99a4805 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.h +++ b/src/server/game/Spells/Auras/SpellAuraEffects.h @@ -67,7 +67,6 @@ class AuraEffect void PeriodicTick(AuraApplication * aurApp, Unit * caster) const; void PeriodicDummyTick(Unit * target, Unit * caster) const; - Unit* GetTriggerTarget(Unit * target) const; void TriggerSpell(Unit * target, Unit * caster) const; void TriggerSpellWithValue(Unit * target, Unit * caster) const; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index ade4fab62e8..8f228ada972 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -255,39 +255,6 @@ public: CAST_AI(aqsentinelAI, sent->AI())->GainSentinelAbility(ability); } } - - Unit *GetHatedManaUser() const - { - std::list<HostileReference*> const& threatList = me->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::const_iterator i = threatList.begin(); i != threatList.end(); ++i) - if (Unit* unit = (*i)->getTarget()) - if (unit->getPowerType() == POWER_MANA) - return unit; - - return NULL; - } - - Unit* GetAuraEffectTriggerTarget(uint32 spellId, uint8 /*effIndex*/) - { - switch (spellId) - { - case SPELL_KNOCK_BUFF: - case SPELL_THUNDER_BUFF: - case SPELL_MSTRIKE_BUFF: - case SPELL_STORM_BUFF: - return me->getVictim(); - - case SPELL_MANAB_BUFF: - return GetHatedManaUser(); - - case SPELL_MENDING_BUFF: - case SPELL_REFLECTAF_BUFF: - case SPELL_REFLECTSFr_BUFF: - case SPELL_THORNS_BUFF: - default: - return me; - } - } }; }; |