public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/QuestTracker): do not store quest if quest_id is null (#4027)

Browse Source
This commit is contained in:
Francesco Borzì
2021-01-20 01:14:04 +01:00
committed by GitHub
parent 6f81eee02d
commit 8d5347b9ab
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15876,7 +15876,7 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER))
{ {
// prepare Quest Tracker datas // prepare Quest Tracker datas
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_QUEST_TRACK); auto stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_QUEST_TRACK);
stmt->setUInt32(0, quest_id); stmt->setUInt32(0, quest_id);
stmt->setUInt32(1, GetGUIDLow()); stmt->setUInt32(1, GetGUIDLow());
stmt->setString(2, _HASH); stmt->setString(2, _HASH);
@@ -15893,31 +15893,35 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
void Player::CompleteQuest(uint32 quest_id) void Player::CompleteQuest(uint32 quest_id)
{ {
if (quest_id) if (!quest_id)
{ {
SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE); return;
uint16 log_slot = FindQuestSlot(quest_id);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotState(log_slot, QUEST_STATE_COMPLETE);
Quest const* qInfo = sObjectMgr->GetQuestTemplate(quest_id);
if (qInfo && qInfo->HasFlag(QUEST_FLAGS_TRACKING))
{
RewardQuest(qInfo, 0, this, false);
}
// Xinef: area auras may change on quest completion!
UpdateZoneDependentAuras(GetZoneId());
UpdateAreaDependentAuras(GetAreaId());
AdditionalSavingAddMask(ADDITIONAL_SAVING_INVENTORY_AND_GOLD | ADDITIONAL_SAVING_QUEST_STATUS);
} }
SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
auto log_slot = FindQuestSlot(quest_id);
if (log_slot < MAX_QUEST_LOG_SIZE)
{
SetQuestSlotState(log_slot, QUEST_STATE_COMPLETE);
}
Quest const* qInfo = sObjectMgr->GetQuestTemplate(quest_id);
if (qInfo && qInfo->HasFlag(QUEST_FLAGS_TRACKING))
{
RewardQuest(qInfo, 0, this, false);
}
// Xinef: area auras may change on quest completion!
UpdateZoneDependentAuras(GetZoneId());
UpdateAreaDependentAuras(GetAreaId());
AdditionalSavingAddMask(ADDITIONAL_SAVING_INVENTORY_AND_GOLD | ADDITIONAL_SAVING_QUEST_STATUS);
// check if Quest Tracker is enabled // check if Quest Tracker is enabled
if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER))
{ {
// prepare Quest Tracker datas // prepare Quest Tracker datas
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_COMPLETE_TIME); auto stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_COMPLETE_TIME);
stmt->setUInt32(0, quest_id); stmt->setUInt32(0, quest_id);
stmt->setUInt32(1, GetGUIDLow()); stmt->setUInt32(1, GetGUIDLow());

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

@@ -432,7 +432,7 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recvData)
if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER))
{ {
// prepare Quest Tracker datas // prepare Quest Tracker datas
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_ABANDON_TIME); auto stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_ABANDON_TIME);
stmt->setUInt32(0, questId); stmt->setUInt32(0, questId);
stmt->setUInt32(1, _player->GetGUIDLow()); stmt->setUInt32(1, _player->GetGUIDLow());

2
src/server/scripts/Commands/cs_quest.cpp
View File

@@ -235,7 +235,7 @@ public:
if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER))
{ {
// prepare Quest Tracker datas // prepare Quest Tracker datas
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_GM_COMPLETE); auto stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_GM_COMPLETE);
stmt->setUInt32(0, quest->GetQuestId()); stmt->setUInt32(0, quest->GetQuestId());
stmt->setUInt32(1, player->GetGUIDLow()); stmt->setUInt32(1, player->GetGUIDLow());