Core/Quests: Updated quest future status checks to include all variants of that status
Port From (https://github.com/TrinityCore/TrinityCore/commit/5875058ed813b90aa37c403a044d471e6ab39a89)
This commit is contained in:
@@ -464,6 +464,8 @@ namespace Framework.Constants
|
||||
LegendaryRewardCompletePOI = 0x100000000000,
|
||||
ImportantQuestRewardCompleteNoPOI = 0x200000000000,
|
||||
ImportantQuestRewardCompletePOI = 0x400000000000,
|
||||
|
||||
FutureMask = Future | FutureJourneyQuest | FutureLegendaryQuest | FutureImportantQuest
|
||||
}
|
||||
|
||||
[Flags]
|
||||
|
||||
@@ -1395,8 +1395,7 @@ namespace Game.Entities
|
||||
switch (GetGoType())
|
||||
{
|
||||
case GameObjectTypes.QuestGiver:
|
||||
QuestGiverStatus questStatus = target.GetQuestDialogStatus(this);
|
||||
if (questStatus != QuestGiverStatus.None && questStatus != QuestGiverStatus.Future)
|
||||
if ((target.GetQuestDialogStatus(this) & ~QuestGiverStatus.FutureMask) != QuestGiverStatus.None)
|
||||
return true;
|
||||
break;
|
||||
case GameObjectTypes.Chest:
|
||||
|
||||
@@ -3222,7 +3222,7 @@ namespace Game.Entities
|
||||
packet.LaunchGossip = quest.HasFlag(QuestFlags.LaunchGossipComplete);
|
||||
|
||||
if (questGiver.IsQuestGiver())
|
||||
packet.LaunchQuest = (GetQuestDialogStatus(questGiver) & ~QuestGiverStatus.Future) != QuestGiverStatus.None;
|
||||
packet.LaunchQuest = (GetQuestDialogStatus(questGiver) & ~QuestGiverStatus.FutureMask) != QuestGiverStatus.None;
|
||||
|
||||
if (!quest.HasFlag(QuestFlags.AutoComplete))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user