diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Quests/QuestDef.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Quests/QuestDef.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Handlers/QuestHandler.cpp | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp index 408f4ab2397..f1e120bf4d8 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp @@ -830,8 +830,11 @@ void BattleGroundSA::UpdateDemolisherSpawns() { uint8 gy = (i >= BG_SA_DEMOLISHER_3 ? 3 : 2); if (GraveyardStatus[gy] == attackers) - Demolisher->Relocate(BG_SA_NpcSpawnlocs[i + 11][0], BG_SA_NpcSpawnlocs[i + 10][1], - BG_SA_NpcSpawnlocs[i + 10][2], BG_SA_NpcSpawnlocs[i + 10][3]); + Demolisher->Relocate(BG_SA_NpcSpawnlocs[i + 11][0], BG_SA_NpcSpawnlocs[i + 11][1], + BG_SA_NpcSpawnlocs[i + 11][2], BG_SA_NpcSpawnlocs[i + 11][3]); + else + Demolisher->Relocate(BG_SA_NpcSpawnlocs[i][0], BG_SA_NpcSpawnlocs[i][1], + BG_SA_NpcSpawnlocs[i][2], BG_SA_NpcSpawnlocs[i][3]); Demolisher->Respawn(); } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 760a681c02b..8b2b74b572d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -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)) diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 43ad7ffc114..553d7630fae 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -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; diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index f524b7935cb..28cd7ac5cd8 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -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; diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp index 35cc582ccc2..a6cb13a02e2 100644 --- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp @@ -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)) |