aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptMgr.cpp
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-09-29 19:23:52 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-09-29 19:23:52 +0200
commit977b5f41e9bce2a6e3b8ae182b43ebc312b0f78f (patch)
tree1fa43870a12865cb255c39a86ec75ebd92acbba5 /src/server/game/Scripting/ScriptMgr.cpp
parent79936ef1b0adf61e21a2274d16ae6dd60230ff5a (diff)
parentc34af1d60bba8d45a78863339cd5a240da5b5d5e (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index a65299140fa..cb77d7bd416 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -102,9 +102,10 @@ class ScriptRegistry
else
{
// The script uses a script name from database, but isn't assigned to anything.
- if (script->GetName().find("Smart") == std::string::npos)
- TC_LOG_ERROR("sql.sql", "Script named '%s' does not have a script name assigned in database.",
- script->GetName().c_str());
+ TC_LOG_ERROR("sql.sql", "Script named '%s' does not have a script name assigned in database.", script->GetName().c_str());
+
+ delete script;
+ return;
}
}
else