From 1929ca3aa14f6cd83ea3ac9d7e8c0e2ed0e87a26 Mon Sep 17 00:00:00 2001 From: ariel- Date: Fri, 28 Apr 2017 17:58:39 -0300 Subject: Core/Scripts: remove OnDummyEffect hook/sOnDummyEffect ai hook - Duplicated logic never used, sometimes only ScriptMgr version was called, sometimes only AI - They only encourage bad scripting practices - You can still use OnSpellHit or a SpellScript (cherry picked from commit b6b59f6c239bc0259c92c28bf43bbb50573330b5) --- src/server/game/Scripting/ScriptMgr.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index e9596c4fdd3..fea767fa9a5 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1637,15 +1637,6 @@ InstanceScript* ScriptMgr::CreateInstanceData(InstanceMap* map) return tmpscript->GetInstanceScript(map); } -bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, Item* target) -{ - ASSERT(caster); - ASSERT(target); - - GET_SCRIPT_RET(ItemScript, target->GetScriptId(), tmpscript, false); - return tmpscript->OnDummyEffect(caster, spellId, effIndex, target); -} - bool ScriptMgr::OnQuestAccept(Player* player, Item* item, Quest const* quest) { ASSERT(player); @@ -1695,15 +1686,6 @@ bool ScriptMgr::OnCastItemCombatSpell(Player* player, Unit* victim, SpellInfo co return tmpscript->OnCastItemCombatSpell(player, victim, spellInfo, item); } -bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, Creature* target) -{ - ASSERT(caster); - ASSERT(target); - - GET_SCRIPT_RET(CreatureScript, target->GetScriptId(), tmpscript, false); - return tmpscript->OnDummyEffect(caster, spellId, effIndex, target); -} - bool ScriptMgr::OnGossipHello(Player* player, Creature* creature) { ASSERT(player); @@ -1920,15 +1902,6 @@ void ScriptMgr::OnGameObjectUpdate(GameObject* go, uint32 diff) tmpscript->OnUpdate(go, diff); } -bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, GameObject* target) -{ - ASSERT(caster); - ASSERT(target); - - GET_SCRIPT_RET(GameObjectScript, target->GetScriptId(), tmpscript, false); - return tmpscript->OnDummyEffect(caster, spellId, effIndex, target); -} - bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) { ASSERT(player); -- cgit v1.2.3