diff options
Diffstat (limited to 'src/server/scripts')
3 files changed, 14 insertions, 13 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 956400e1814..952f5a316c9 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -44,6 +44,8 @@ EndScriptData */ #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "PhasingHandler.h" +#include "PoolMgr.h" +#include "QuestPools.h" #include "RBAC.h" #include "SpellMgr.h" #include "SpellPackets.h" @@ -1482,21 +1484,20 @@ public: else return false; - time_t const now = GameTime::GetGameTime(); if (daily) { - sWorld->m_NextDailyQuestReset = now; - handler->SendSysMessage("Daily quest reset scheduled for next tick."); + sWorld->DailyReset(); + handler->PSendSysMessage("Daily quests have been reset. Next scheduled reset: %s", TimeToHumanReadable(sWorld->getWorldState(WS_DAILY_QUEST_RESET_TIME)).c_str()); } if (weekly) { - sWorld->m_NextWeeklyQuestReset = now; - handler->SendSysMessage("Weekly quest reset scheduled for next tick."); + sWorld->ResetWeeklyQuests(); + handler->PSendSysMessage("Weekly quests have been reset. Next scheduled reset: %s", TimeToHumanReadable(sWorld->getWorldState(WS_WEEKLY_QUEST_RESET_TIME)).c_str()); } if (monthly) { - sWorld->m_NextMonthlyQuestReset = now; - handler->SendSysMessage("Monthly quest reset scheduled for next tick."); + sWorld->ResetMonthlyQuests(); + handler->PSendSysMessage("Monthly quests have been reset. Next scheduled reset: %s", TimeToHumanReadable(sWorld->getWorldState(WS_MONTHLY_QUEST_RESET_TIME)).c_str()); } return true; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 124054ffd47..3cb361ac63a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -21,7 +21,7 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "PoolMgr.h" +#include "QuestPools.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" @@ -511,7 +511,7 @@ class boss_lady_deathwhisper : public CreatureScript uint8 addIndexOther = uint8(addIndex ^ 1); // Summon first add, replace it with Darnavan if weekly quest is active - if (_waveCounter || !sPoolMgr->IsSpawnedObject<Quest>(QUEST_DEPROGRAMMING)) + if (_waveCounter || !sQuestPoolMgr->IsQuestActive(QUEST_DEPROGRAMMING)) Summon(SummonEntries[addIndex], SummonPositions[addIndex * 3]); else Summon(NPC_DARNAVAN, SummonPositions[addIndex * 3]); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 35f40a8f0db..1623d85fc5e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -23,7 +23,7 @@ #include "Map.h" #include "ObjectMgr.h" #include "Player.h" -#include "PoolMgr.h" +#include "QuestPools.h" #include "TemporarySummon.h" #include "Transport.h" #include "TransportMgr.h" @@ -346,7 +346,7 @@ class instance_icecrown_citadel : public InstanceMapScript if (WeeklyQuestData[questIndex].creatureEntry == entry) { uint8 diffIndex = instance->Is25ManRaid() ? 1 : 0; - if (!sPoolMgr->IsSpawnedObject<Quest>(WeeklyQuestData[questIndex].questId[diffIndex])) + if (!sQuestPoolMgr->IsQuestActive(WeeklyQuestData[questIndex].questId[diffIndex])) return 0; break; } @@ -964,7 +964,7 @@ class instance_icecrown_citadel : public InstanceMapScript case DATA_VALITHRIA_DREAMWALKER: if (state == DONE) { - if (sPoolMgr->IsSpawnedObject<Quest>(WeeklyQuestData[8].questId[instance->Is25ManRaid() ? 1 : 0])) + if (sQuestPoolMgr->IsQuestActive(WeeklyQuestData[8].questId[instance->Is25ManRaid() ? 1 : 0])) instance->SummonCreature(NPC_VALITHRIA_DREAMWALKER_QUEST, ValithriaSpawnPos); if (GameObject* teleporter = instance->GetGameObject(TeleporterSindragosaGUID)) SetTeleporterState(teleporter, true); @@ -1051,7 +1051,7 @@ class instance_icecrown_citadel : public InstanceMapScript break; // 5 is the index of Blood Quickening - if (!sPoolMgr->IsSpawnedObject<Quest>(WeeklyQuestData[5].questId[instance->Is25ManRaid() ? 1 : 0])) + if (!sQuestPoolMgr->IsQuestActive(WeeklyQuestData[5].questId[instance->Is25ManRaid() ? 1 : 0])) break; switch (data) |