Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Fixed crash on shutdown

Browse Source
This commit is contained in:
Shauren
2012-12-17 11:44:41 +01:00
parent 5a52acbe40
commit 7be13b6fda
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -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