Core: Updated to 11.1.5

2 files changed, 16 insertions, 9 deletions

diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index aef47a0acac..023cc51d2f9 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -33,7 +33,7 @@
 
 #define QUEST_TEMPLATE_FIELDS (ID)(QuestType)(QuestPackageID)(ContentTuningID)(QuestSortID)(QuestInfoID)(SuggestedGroupNum)(RewardNextQuest)(RewardXPDifficulty)\
     (RewardXPMultiplier)(RewardMoneyDifficulty)(RewardMoneyMultiplier)(RewardBonusMoney)(RewardSpell)(RewardHonor)(RewardKillHonor)(StartItem)\
-    (RewardArtifactXPDifficulty)(RewardArtifactXPMultiplier)(RewardArtifactCategoryID)(Flags)(FlagsEx)(FlagsEx2)\
+    (RewardArtifactXPDifficulty)(RewardArtifactXPMultiplier)(RewardArtifactCategoryID)(Flags)(FlagsEx)(FlagsEx2)(FlagsEx3)\
     (RewardItem1)(RewardAmount1)(ItemDrop1)(ItemDropQuantity1)(RewardItem2)(RewardAmount2)(ItemDrop2)(ItemDropQuantity2)\
     (RewardItem3)(RewardAmount3)(ItemDrop3)(ItemDropQuantity3)(RewardItem4)(RewardAmount4)(ItemDrop4)(ItemDropQuantity4)\
     (RewardChoiceItemID1)(RewardChoiceItemQuantity1)(RewardChoiceItemDisplayID1)(RewardChoiceItemID2)(RewardChoiceItemQuantity2)(RewardChoiceItemDisplayID2)\
@@ -109,6 +109,7 @@ Quest::Quest(QuestTemplateQueryResult const& questRecord) :
     _flags(questRecord.Flags().GetUInt32()),
     _flagsEx(questRecord.FlagsEx().GetUInt32()),
     _flagsEx2(questRecord.FlagsEx2().GetUInt32()),
+    _flagsEx3(questRecord.FlagsEx3().GetUInt32()),
     _poiContinent(questRecord.POIContinent().GetUInt32()),
     _poix(questRecord.POIx().GetFloat()),
     _poiy(questRecord.POIy().GetFloat()),
@@ -733,6 +734,7 @@ WorldPacket Quest::BuildQueryData(LocaleConstant loc, Player* player) const
     response.Info.Flags = GetFlags();
     response.Info.FlagsEx = GetFlagsEx();
     response.Info.FlagsEx2 = GetFlagsEx2();
+    response.Info.FlagsEx3 = GetFlagsEx3();
     response.Info.RewardTitle = GetRewTitle();
     response.Info.RewardArenaPoints = GetRewArenaPoints();
     response.Info.RewardSkillLineID = GetRewardSkillId();
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 616cf5c2fe7..59f38eed53b 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -402,14 +402,17 @@ enum QuestObjectiveFlags2
 
 enum class QuestCompleteSpellType : uint32
 {
-    LegacyBehavior  = 0,
-    Follower        = 1,
-    Tradeskill      = 2,
-    Ability         = 3,
-    Aura            = 4,
-    Spell           = 5,
-    Unlock          = 6,
-    Companion       = 7,
+    LegacyBehavior      = 0,
+    Follower            = 1,
+    Tradeskill          = 2,
+    Ability             = 3,
+    Aura                = 4,
+    Spell               = 5,
+    Unlock              = 6,
+    Companion           = 7,
+    QuestlineUnlock     = 8,
+    QuestlineReward     = 9,
+    QuestlineUnlockPart = 10,
     Max
 };
 
@@ -698,6 +701,7 @@ class TC_GAME_API Quest
         uint32 GetFlags() const { return _flags; }
         uint32 GetFlagsEx() const { return _flagsEx; }
         uint32 GetFlagsEx2() const { return _flagsEx2; }
+        uint32 GetFlagsEx3() const { return _flagsEx3; }
         uint32 GetSpecialFlags() const { return _specialFlags; }
         uint32 GetScriptId() const { return _scriptId; }
         uint32 GetAreaGroupID() const { return _areaGroupID; }
@@ -796,6 +800,7 @@ class TC_GAME_API Quest
         uint32 _flags = 0;
         uint32 _flagsEx = 0;
         uint32 _flagsEx2 = 0;
+        uint32 _flagsEx3 = 0;
         uint32 _poiContinent = 0;
         float _poix = 0.f;
         float _poiy = 0.f;