Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Quests: Update phaseshift when taking or abandoning quests (#29901)

Browse Source
This commit is contained in:
Meji
2024-04-08 13:26:04 +02:00
committed by GitHub
parent f331bd1a28
commit c90dbeb648
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/server/game/Entities/Player/Player.cpp
View File

@@ -14992,6 +14992,10 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
SendQuestUpdate(quest_id);
bool updateVisibility = false;
if (quest->HasFlag(QUEST_FLAGS_UPDATE_PHASESHIFT))
updateVisibility = PhasingHandler::OnConditionChange(this, false);
if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) // check if Quest Tracker is enabled
{
// prepare Quest Tracker datas
@@ -15005,6 +15009,9 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
CharacterDatabase.Execute(stmt);
}
if (updateVisibility)
UpdateObjectVisibility();
sScriptMgr->OnQuestStatusChange(this, quest_id);
sScriptMgr->OnQuestStatusChange(this, quest, oldStatus, questStatusData.Status);
}
@@ -16104,8 +16111,19 @@ void Player::RemoveActiveQuest(uint32 questId, bool update /*= true*/)
m_QuestStatusSave[questId] = QUEST_DELETE_SAVE_TYPE;
}
Quest const* quest = sObjectMgr->GetQuestTemplate(questId);
bool updateVisibility = false;
if (update)
{
SendQuestUpdate(questId);
if (quest && quest->HasFlag(QUEST_FLAGS_UPDATE_PHASESHIFT))
updateVisibility = PhasingHandler::OnConditionChange(this, false);
}
if (updateVisibility)
UpdateObjectVisibility();
}
void Player::RemoveRewardedQuest(uint32 questId, bool update /*= true*/)
@@ -16121,11 +16139,14 @@ void Player::RemoveRewardedQuest(uint32 questId, bool update /*= true*/)
SetQuestCompletedBit(questBit, false);
// Remove seasonal quest also
Quest const* qInfo = sObjectMgr->GetQuestTemplate(questId);
ASSERT(qInfo);
if (qInfo->IsSeasonal())
Quest const* quest = sObjectMgr->GetQuestTemplate(questId);
bool updateVisibility = false;
ASSERT(quest);
if (quest->IsSeasonal())
{
uint16 eventId = qInfo->GetEventIdForQuest();
uint16 eventId = quest->GetEventIdForQuest();
if (m_seasonalquests.find(eventId) != m_seasonalquests.end())
{
m_seasonalquests[eventId].erase(questId);
@@ -16134,7 +16155,15 @@ void Player::RemoveRewardedQuest(uint32 questId, bool update /*= true*/)
}
if (update)
{
SendQuestUpdate(questId);
if (quest && quest->HasFlag(QUEST_FLAGS_UPDATE_PHASESHIFT))
updateVisibility = PhasingHandler::OnConditionChange(this, false);
}
if (updateVisibility)
UpdateObjectVisibility();
}
void Player::SendQuestUpdate(uint32 questId, bool updateInteractions /*= true*/, bool updateGameObjectQuestGiverStatus /*= false*/)

1
src/server/game/Handlers/QuestHandler.cpp
View File

@@ -40,7 +40,6 @@
void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPackets::Quest::QuestGiverStatusQuery& packet)
{
Object* questGiver = ObjectAccessor::GetObjectByTypeMask(*_player, packet.QuestGiverGUID, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT);
if (!questGiver)
{