diff options
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 41dbd3f3caa..496801f9265 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -35,6 +35,7 @@ #include "DB2Stores.h" #include "DuelPackets.h" #include "DynamicObject.h" +#include "GameEventSender.h" #include "GameObject.h" #include "GameObjectAI.h" #include "GameTime.h" @@ -54,7 +55,6 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "Opcodes.h" #include "OutdoorPvPMgr.h" #include "PathGenerator.h" #include "Pet.h" @@ -1072,12 +1072,7 @@ void Spell::EffectSendEvent() TC_LOG_DEBUG("spells", "Spell ScriptStart %u for spellid %u in EffectSendEvent ", effectInfo->MiscValue, m_spellInfo->Id); - if (ZoneScript* zoneScript = m_caster->GetZoneScript()) - zoneScript->ProcessEvent(target, effectInfo->MiscValue, m_caster); - else if (InstanceScript* instanceScript = m_caster->GetInstanceScript()) // needed in case Player is the caster - instanceScript->ProcessEvent(target, effectInfo->MiscValue, m_caster); - - m_caster->GetMap()->ScriptsStart(sEventScripts, effectInfo->MiscValue, m_caster, target); + GameEvents::Trigger(effectInfo->MiscValue, m_caster, target); } void Spell::EffectPowerBurn() @@ -1549,7 +1544,7 @@ void Spell::SendLoot(ObjectGuid guid, LootType loottype) if (gameObjTarget->GetGOInfo()->chest.triggeredEvent) { TC_LOG_DEBUG("spells", "Chest ScriptStart id %u for GO " UI64FMTD, gameObjTarget->GetGOInfo()->chest.triggeredEvent, gameObjTarget->GetSpawnId()); - player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->chest.triggeredEvent, player, gameObjTarget); + GameEvents::Trigger(gameObjTarget->GetGOInfo()->chest.triggeredEvent, player, gameObjTarget); } // triggering linked GO |