Makes Auto-accepted quests show up the way they should. They should work perfectly again now.
--HG-- branch : trunk
This commit is contained in:
@@ -13918,7 +13918,7 @@ void Player::SendPreparedQuest(uint64 guid)
|
||||
return;
|
||||
}
|
||||
|
||||
if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_AUTO_ACCEPT) && CanAddQuest(pQuest, true))
|
||||
if (pQuest->IsAutoAccept() && CanAddQuest(pQuest, true))
|
||||
{
|
||||
AddQuest(pQuest, pObject);
|
||||
if (CanCompleteQuest(quest_id))
|
||||
|
||||
@@ -143,6 +143,8 @@ Quest::Quest(Field * questRecord)
|
||||
QuestCompleteScript = questRecord[143].GetUInt32();
|
||||
|
||||
QuestFlags |= SpecialFlags << 20;
|
||||
if (QuestFlags & QUEST_TRINITY_FLAGS_AUTO_ACCEPT)
|
||||
QuestFlags |= QUEST_FLAGS_AUTO_ACCEPT;
|
||||
|
||||
m_reqitemscount = 0;
|
||||
m_reqCreatureOrGOcount = 0;
|
||||
|
||||
@@ -246,7 +246,7 @@ class Quest
|
||||
bool IsDaily() const { return QuestFlags & QUEST_FLAGS_DAILY; }
|
||||
bool IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; }
|
||||
bool IsDailyOrWeekly() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
|
||||
bool IsAutoAccept() const { return QuestFlags & QUEST_TRINITY_FLAGS_AUTO_ACCEPT; }
|
||||
bool IsAutoAccept() const { return QuestFlags & QUEST_FLAGS_AUTO_ACCEPT; }
|
||||
bool IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; }
|
||||
bool IsAllowedInRaid() const;
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket & recv_data)
|
||||
Quest const* pQuest = objmgr.GetQuestTemplate(quest);
|
||||
if (pQuest)
|
||||
{
|
||||
if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_AUTO_ACCEPT) && _player->CanAddQuest(pQuest, true))
|
||||
if (pQuest->IsAutoAccept() && _player->CanAddQuest(pQuest, true))
|
||||
{
|
||||
_player->AddQuest(pQuest, pObject);
|
||||
if (_player->CanCompleteQuest(quest))
|
||||
|
||||
Reference in New Issue
Block a user