aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfunjoker <torti-esser@web.de>2017-07-09 17:58:11 +0200
committerTreeston <treeston.mmoc@gmail.com>2017-07-09 17:58:11 +0200
commit48f941e80a07b25c50b5d2fbd45bcafe000ed455 (patch)
tree9e45a35fc03cd71d6f51757524a47165a1b651e7
parent1bf522ed7b4e1d71358da8c932d8b6a11f5fbd38 (diff)
Correct ingame display order of Objectives (#19986)
-rw-r--r--sql/updates/world/master/2017_07_09_00_world.sql2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/updates/world/master/2017_07_09_00_world.sql b/sql/updates/world/master/2017_07_09_00_world.sql
new file mode 100644
index 00000000000..43730904c3e
--- /dev/null
+++ b/sql/updates/world/master/2017_07_09_00_world.sql
@@ -0,0 +1,2 @@
+-- Note: quest_objectives need new full parse to get proper Order
+ALTER TABLE `quest_objectives` ADD COLUMN `Order` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `Type`;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 9acb9f6b5de..fd7f7da0020 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -4015,7 +4015,7 @@ void ObjectMgr::LoadQuests()
// Load `quest_objectives`
// 0 1 2 3 4 5 6 7 8 9
- result = WorldDatabase.Query("SELECT ID, QuestID, Type, StorageIndex, ObjectID, Amount, Flags, Flags2, ProgressBarWeight, Description FROM quest_objectives ORDER BY StorageIndex ASC");
+ result = WorldDatabase.Query("SELECT ID, QuestID, Type, StorageIndex, ObjectID, Amount, Flags, Flags2, ProgressBarWeight, Description FROM quest_objectives ORDER BY Order ASC, StorageIndex ASC");
if (!result)
{