From 8376ed5d3f7d2941430c7d0542b312bd74727562 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sat, 22 Feb 2020 16:17:18 -0600 Subject: [PATCH] PR adjustments --- common/ruletypes.h | 2 +- zone/zone_reload.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/ruletypes.h b/common/ruletypes.h index 3e2c56c03..c584f37a7 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -766,7 +766,7 @@ RULE_CATEGORY_END() RULE_CATEGORY(HotReload) RULE_BOOL(HotReload, QuestsRepopWithReload, true, "When a hot reload is triggered, the zone will repop") RULE_BOOL(HotReload, QuestsRepopWhenPlayersNotInCombat, true, "When a hot reload is triggered, the zone will repop when no clients are in combat") -RULE_BOOL(HotReload, QuestsResetTimersWithReload, true, "When a hot reload is triggered, the zone will repop") +RULE_BOOL(HotReload, QuestsResetTimersWithReload, true, "When a hot reload is triggered, quest timers will be reset") RULE_CATEGORY_END() #undef RULE_CATEGORY diff --git a/zone/zone_reload.cpp b/zone/zone_reload.cpp index 42424dae2..3dca89d71 100644 --- a/zone/zone_reload.cpp +++ b/zone/zone_reload.cpp @@ -24,7 +24,6 @@ void ZoneReload::HotReloadQuests() { BenchTimer timer; - timer.reset(); entity_list.ClearAreas(); @@ -33,6 +32,7 @@ void ZoneReload::HotReloadQuests() if (RuleB(HotReload, QuestsRepopWithReload)) { zone->Repop(0); } + zone->SetQuestHotReloadQueued(false); LogHotReload(