aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/World
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-07-31 11:21:24 +0200
committerShauren <shauren.trinity@gmail.com>2020-07-31 11:21:24 +0200
commit1340f2cdb33a4feac01e68d2f65ae1ae486e135f (patch)
treebc47f6026c5f493ace39e6c0d9fd128ea8507a14 /src/server/game/World
parent8116ad58892b2170d4cea32a6ce2c5c265acf4b2 (diff)
Core/Creatures: Move gossip trainer assignment to creature_trainer table - same gossip can open different trainers depending on which creature it is assigned to
Closes #21723
Diffstat (limited to 'src/server/game/World')
-rw-r--r--src/server/game/World/World.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index cce33cd7795..db5c0c45e6e 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1995,14 +1995,14 @@ void World::SetInitialWorldSettings()
TC_LOG_INFO("server.loading", "Loading Trainers...");
sObjectMgr->LoadTrainers(); // must be after load CreatureTemplate
- TC_LOG_INFO("server.loading", "Loading Creature default trainers...");
- sObjectMgr->LoadCreatureDefaultTrainers();
-
TC_LOG_INFO("server.loading", "Loading Gossip menu...");
sObjectMgr->LoadGossipMenu();
TC_LOG_INFO("server.loading", "Loading Gossip menu options...");
- sObjectMgr->LoadGossipMenuItems(); // must be after LoadTrainers
+ sObjectMgr->LoadGossipMenuItems();
+
+ TC_LOG_INFO("server.loading", "Loading Creature trainers...");
+ sObjectMgr->LoadCreatureTrainers(); // must be after LoadGossipMenuItems
TC_LOG_INFO("server.loading", "Loading Vendors...");
sObjectMgr->LoadVendors(); // must be after load CreatureTemplate and ItemTemplate