Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Change PlayerScript and CreatureScript inheritance (#23048)

Browse Source 
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 5b7ead65bb)
This commit is contained in:
Giacomo Pozzoni
2019-02-15 20:29:14 +01:00
committed by Shauren
parent 47adf2e4c8
commit ed5ba915f1
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Scripting/ScriptMgr.cpp
View File

@@ -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<FormulaScript>::Instance()->AddScript(this);
}
UnitScript::UnitScript(char const* name, bool addToScripts)
UnitScript::UnitScript(char const* name)
: ScriptObject(name)
{
if (addToScripts)
ScriptRegistry<UnitScript>::Instance()->AddScript(this);
ScriptRegistry<UnitScript>::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<CreatureScript>::Instance()->AddScript(this);
}
@@ -2504,7 +2498,7 @@ AchievementCriteriaScript::AchievementCriteriaScript(char const* name)
}
PlayerScript::PlayerScript(char const* name)
: UnitScript(name, false)
: ScriptObject(name)
{
ScriptRegistry<PlayerScript>::Instance()->AddScript(this);
}

6
src/server/game/Scripting/ScriptMgr.h
View File

@@ -393,7 +393,7 @@ class TC_GAME_API UnitScript : public ScriptObject
{
protected:
UnitScript(char const* name, bool addToScripts = true);
UnitScript(char const* name);
public:
// Called when a unit deals healing to another unit
@@ -412,7 +412,7 @@ class TC_GAME_API UnitScript : public ScriptObject
virtual void ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, int32& /*damage*/, SpellInfo const* /*spellInfo*/) { }
};
class TC_GAME_API CreatureScript : public UnitScript
class TC_GAME_API CreatureScript : public ScriptObject
{
protected:
@@ -612,7 +612,7 @@ class TC_GAME_API AchievementCriteriaScript : public ScriptObject
virtual bool OnCheck(Player* source, Unit* target) = 0;
};
class TC_GAME_API PlayerScript : public UnitScript
class TC_GAME_API PlayerScript : public ScriptObject
{
protected: