diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2015-09-03 06:13:04 -0700 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2015-09-03 06:13:04 -0700 |
| commit | 821b5f2b5c17a3582e23ba22b2e7cf17e063d709 (patch) | |
| tree | 8b30b5ee08f554e2755b7e09ad40c8a8bfd96c6b | |
| parent | 9a1301df4698f4eb6c34145a1c8d3254a1ae5b85 (diff) | |
| parent | b41e0156dbc084ec35603cb30492e0410eb697dd (diff) | |
Merge pull request #15413 from ShinDarth/sort_quest_template
DB/World: fix bad field rename introduced in 6b43e72f019b6a91be812f4e4da58a4dae7c21a6
| -rw-r--r-- | sql/updates/world/2015_09_03_05_world_335.sql | 3 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/updates/world/2015_09_03_05_world_335.sql b/sql/updates/world/2015_09_03_05_world_335.sql new file mode 100644 index 00000000000..eed2d862803 --- /dev/null +++ b/sql/updates/world/2015_09_03_05_world_335.sql @@ -0,0 +1,3 @@ +ALTER TABLE `quest_template` + CHANGE COLUMN `Method` `QuestType` TINYINT(3) UNSIGNED NOT NULL DEFAULT '2' AFTER `ID`, + CHANGE COLUMN `QuestType` `QuestInfoID` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `QuestSortID`; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index a568409d918..71b06c1a308 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3966,8 +3966,8 @@ void ObjectMgr::LoadQuests() mExclusiveQuestGroups.clear(); QueryResult result = WorldDatabase.Query("SELECT " - //0 1 2 3 4 5 6 7 8 - "ID, Method, QuestLevel, MinLevel, QuestSortID, QuestType, SuggestedGroupNum, LimitTime, RequiredRaces," + //0 1 2 3 4 5 6 7 8 + "ID, QuestType, QuestLevel, MinLevel, QuestSortID, QuestInfoID, SuggestedGroupNum, LimitTime, RequiredRaces," // 9 10 11 12 "RequiredFactionId1, RequiredFactionId2, RequiredFactionValue1, RequiredFactionValue2, " // 13 14 15 16 17 18 19 20 |