Revert "Core/Event: prevent seasonal quests from resetting at server restart (#17455)"

This reverts commit 6a8ca9b0bf6f7cd355e1994723d6be6a5003d4d4.

# Conflicts:
#	src/server/game/Events/GameEventMgr.cpp
This commit is contained in:
Shauren authored and Ovahlord committed 2022-12-24 23:36:13 +01:00
1 parent aea5d7429e
commit e7f8a0e086
1 file changed
+2 -12
+2 -12
View File
@@ -142,9 +142,6 @@ bool GameEventMgr::StartEvent(uint16 event_id, bool overwrite)
if (data.end <= data.start)
data.end = data.start + data.length;
}
// When event is started, set its worldstate to current time
sWorld->setWorldState(event_id, GameTime::GetGameTime());
return false;
}
else
@@ -180,9 +177,6 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)
RemoveActiveEvent(event_id);
UnApplyEvent(event_id);
// When event is stopped, clean up its worldstate
sWorld->setWorldState(event_id, 0);
if (overwrite && !serverwide_evt)
{
data.start = GameTime::GetGameTime() - data.length * MINUTE;
@@ -1098,8 +1092,6 @@ uint32 GameEventMgr::Update() // return the next e
}
else
{
// If event is inactive, periodically clean up its worldstate
sWorld->setWorldState(itr, 0);
//TC_LOG_DEBUG("misc", "GameEvent %u is not active", itr->first);
if (IsActiveEvent(itr))
deactivate.insert(itr);
@@ -1182,10 +1174,8 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id)
UpdateEventNPCVendor(event_id, true);
// update bg holiday
UpdateBattlegroundSettings();
// If event's worldstate is 0, it means the event hasn't been started yet. In that case, reset seasonal quests.
// When event ends (if it expires or if it's stopped via commands) worldstate will be set to 0 again, ready for another seasonal quest reset.
if (sWorld->getWorldState(event_id) == 0)
sWorld->ResetEventSeasonalQuests(event_id);
// check for seasonal quest reset.
sWorld->ResetEventSeasonalQuests(event_id);
}
void GameEventMgr::UpdateEventNPCFlags(uint16 event_id)