Undo RDF Holliday Commit

This commit is contained in:
Dinkledork
2023-09-27 18:32:59 -06:00
committed by GitHub
parent fa7d7ed502
commit 4ad27208ff

View File

@@ -348,20 +348,14 @@ public:
void OnQueueRandomDungeon(Player* player, uint32& rDungeonId) override void OnQueueRandomDungeon(Player* player, uint32& rDungeonId) override
{ {
std::set<uint32> seasonalEventIds = { 285, 286, 287, 288 }; // Allow Headless Horseman, Frost Lord Ahune, Coren Direbrew, Crown Chemical Co.
bool isSeasonalEvent = (seasonalEventIds.find(rDungeonId) != seasonalEventIds.end());
// Check if RDF is disabled in the context of Individual Progression // Check if RDF is disabled in the context of Individual Progression
if (sConfigMgr->GetOption<bool>("IndividualProgression.DisableRDF", false) && !isSeasonalEvent) if (sConfigMgr->GetOption<bool>("IndividualProgression.DisableRDF", false))
{ {
// Notify the player // Notify the player
player->GetSession()->SendNotification("The Random Dungeon feature is currently disabled by the Individual Progression module."); player->GetSession()->SendNotification("The Random Dungeon feature is currently disabled by the Individual Progression module.");
rDungeonId = 1000; // Set dungeon ID to an invalid value to cancel the queuing rDungeonId = 1000; // Set dungeon ID to an invalid value to cancel the queuing
return; return;
} }
// Other logic for individual progression checks
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40)) if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
{ {
rDungeonId = RDF_CLASSIC; rDungeonId = RDF_CLASSIC;