diff options
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index c7eebb0919e..3be9557e61e 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1379,10 +1379,11 @@ FormulaScript::FormulaScript(const char* name) ScriptRegistry<FormulaScript>::AddScript(this); } -UnitScript::UnitScript(const char* name) +UnitScript::UnitScript(const char* name, bool addToScripts) : ScriptObject(name) { - ScriptRegistry<UnitScript>::AddScript(this); + if (addToScripts) + ScriptRegistry<UnitScript>::AddScript(this); } WorldMapScript::WorldMapScript(const char* name, uint32 mapId) @@ -1419,7 +1420,7 @@ ItemScript::ItemScript(const char* name) } CreatureScript::CreatureScript(const char* name) - : UnitScript(name) + : UnitScript(name, false) { ScriptRegistry<CreatureScript>::AddScript(this); } @@ -1497,7 +1498,7 @@ AchievementCriteriaScript::AchievementCriteriaScript(const char* name) } PlayerScript::PlayerScript(const char* name) - : UnitScript(name) + : UnitScript(name, false) { ScriptRegistry<PlayerScript>::AddScript(this); } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index f603c76c8d3..785e5662156 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -396,7 +396,7 @@ class UnitScript : public ScriptObject { protected: - UnitScript(const char* name); + UnitScript(const char* name, bool addToScripts = true); public: // Called when DoT's Tick Damage is being Dealt |