diff options
| author | Gustavo <sirikfoll@hotmail.com> | 2016-07-15 18:45:50 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-15 23:45:50 +0200 |
| commit | 23e89b8aef1999bbbd52248c40d7b76c0a67cafb (patch) | |
| tree | 49b34750ea3b5d8d113c8d910e72101f6f71e963 | |
| parent | 55ba3bd012220b4b58793d8de5f90b1585c70a04 (diff) | |
Core/Spells GameObjects needs to be spawned in order to be acceptable as a SpellFocus (#17594)
| -rw-r--r-- | src/server/game/Grids/Notifiers/GridNotifiers.h | 3 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_quest.cpp | 14 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 1d2b0bd33cf..5283805c59d 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -620,6 +620,9 @@ namespace Trinity if (go->GetGOInfo()->spellFocus.focusId != i_focusId) return false; + if (!go->isSpawned()) + return false; + float dist = go->GetGOInfo()->spellFocus.dist / 2.f; return go->IsWithinDistInMap(i_unit, dist); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 1a40988619d..715e4d4ed2d 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -1080,9 +1080,7 @@ enum RedSnapperVeryTasty ITEM_RED_SNAPPER = 23614, SPELL_CAST_NET = 29866, - SPELL_NEW_SUMMON_TEST = 49214, - - GO_SCHOOL_OF_RED_SNAPPER = 181616 + SPELL_NEW_SUMMON_TEST = 49214 }; class spell_q9452_cast_net: public SpellScriptLoader @@ -1099,15 +1097,6 @@ class spell_q9452_cast_net: public SpellScriptLoader return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - SpellCastResult CheckCast() - { - GameObject* go = GetCaster()->FindNearestGameObject(GO_SCHOOL_OF_RED_SNAPPER, 3.0f); - if (!go || go->GetRespawnTime()) - return SPELL_FAILED_REQUIRES_SPELL_FOCUS; - - return SPELL_CAST_OK; - } - void HandleDummy(SpellEffIndex /*effIndex*/) { Player* caster = GetCaster()->ToPlayer(); @@ -1127,7 +1116,6 @@ class spell_q9452_cast_net: public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_q9452_cast_net_SpellScript::CheckCast); OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleActiveObject, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); } |