aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/World
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-01-04 01:27:51 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-01-04 01:27:51 +0100
commit8db66bfefdb9ec7a722dd93aadbbd818c567fba0 (patch)
treeddcd69fed255276f303b0db7c4fe756224824750 /src/server/game/World
parentfe6dc5c3cd8f3d2888badf04ef8f9adfdc8f2cfd (diff)
parent51b5e04a88977e4ce43ce465c514e22857d41a8b (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/World')
-rw-r--r--src/server/game/World/World.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 2396dffc862..099add4bb02 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1656,7 +1656,6 @@ void World::SetInitialWorldSettings()
///- Load and initialize scripts
sObjectMgr->LoadSpellScripts(); // must be after load Creature/Gameobject(Template/Data)
- sObjectMgr->LoadGameObjectScripts(); // must be after load Creature/Gameobject(Template/Data)
sObjectMgr->LoadEventScripts(); // must be after load Creature/Gameobject(Template/Data)
sObjectMgr->LoadWaypointScripts();