From ed5ba915f1ec7dad8f4935b62b0ec2d202d26c1c Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Fri, 15 Feb 2019 20:29:14 +0100 Subject: Core/Scripts: Change PlayerScript and CreatureScript inheritance (#23048) Remove UnitScript from PlayerScript and CreatureScript classes as that's how the original system that was PR'd worked, see https://github.com/TrinityCore/TrinityCore/pull/7867 for reference. Please note these are used as global hooks and should really just invoke stateless functions. If you need to hook methods from PlayerScript/CreatureScript and UnitScript, just define 2 different scripts (this is how the original system worked and how it was designed to work) (cherry picked from commit 5b7ead65bb116195f4336934bcff830e1b2af5bb) --- src/server/game/Scripting/ScriptMgr.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 c154345a755..5401e730c67 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -2228,31 +2228,26 @@ void ScriptMgr::OnGroupDisband(Group* group) void ScriptMgr::OnHeal(Unit* healer, Unit* reciever, uint32& gain) { FOREACH_SCRIPT(UnitScript)->OnHeal(healer, reciever, gain); - FOREACH_SCRIPT(PlayerScript)->OnHeal(healer, reciever, gain); } void ScriptMgr::OnDamage(Unit* attacker, Unit* victim, uint32& damage) { FOREACH_SCRIPT(UnitScript)->OnDamage(attacker, victim, damage); - FOREACH_SCRIPT(PlayerScript)->OnDamage(attacker, victim, damage); } void ScriptMgr::ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage) { FOREACH_SCRIPT(UnitScript)->ModifyPeriodicDamageAurasTick(target, attacker, damage); - FOREACH_SCRIPT(PlayerScript)->ModifyPeriodicDamageAurasTick(target, attacker, damage); } void ScriptMgr::ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage) { FOREACH_SCRIPT(UnitScript)->ModifyMeleeDamage(target, attacker, damage); - FOREACH_SCRIPT(PlayerScript)->ModifyMeleeDamage(target, attacker, damage); } void ScriptMgr::ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage, SpellInfo const* spellInfo) { FOREACH_SCRIPT(UnitScript)->ModifySpellDamageTaken(target, attacker, damage, spellInfo); - FOREACH_SCRIPT(PlayerScript)->ModifySpellDamageTaken(target, attacker, damage, spellInfo); } // Conversation @@ -2361,11 +2356,10 @@ FormulaScript::FormulaScript(char const* name) ScriptRegistry::Instance()->AddScript(this); } -UnitScript::UnitScript(char const* name, bool addToScripts) +UnitScript::UnitScript(char const* name) : ScriptObject(name) { - if (addToScripts) - ScriptRegistry::Instance()->AddScript(this); + ScriptRegistry::Instance()->AddScript(this); } WorldMapScript::WorldMapScript(char const* name, uint32 mapId) @@ -2411,7 +2405,7 @@ ItemScript::ItemScript(char const* name) } CreatureScript::CreatureScript(char const* name) - : UnitScript(name, false) + : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } @@ -2504,7 +2498,7 @@ AchievementCriteriaScript::AchievementCriteriaScript(char const* name) } PlayerScript::PlayerScript(char const* name) - : UnitScript(name, false) + : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } -- cgit v1.2.3