diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-09-14 22:33:40 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-07-09 21:17:59 +0200 |
| commit | 6eecb685ce0f3d3bf4cb7cd387b83ccf384b0c48 (patch) | |
| tree | 1371c51fa67715c8afce5e05110750be534e9ebe /src/server/game/World | |
| parent | 9a9af3cc5f7433a4de653b2cf28f3d8c757db8f9 (diff) | |
Core/Weather: Fixed weather updates to be thread safe
(cherry picked from commit 6eb997394722fcd4b5248646b5abfa185a7ec58f)
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index eac973c5a44..d3d65b19f14 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2041,7 +2041,6 @@ void World::SetInitialWorldSettings() LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, 0, '%s')", realm.Id.Realm, uint32(GameTime::GetStartTime()), GitRevision::GetFullVersion()); // One-time query - m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS); m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS); m_timers[WUPDATE_AUCTIONS_PENDING].SetInterval(250); m_timers[WUPDATE_UPTIME].SetInterval(m_int_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILLISECONDS); @@ -2330,13 +2329,6 @@ void World::Update(uint32 diff) UpdateSessions(diff); sWorldUpdateTime.RecordUpdateTimeDuration("UpdateSessions"); - /// <li> Handle weather updates when the timer has passed - if (m_timers[WUPDATE_WEATHERS].Passed()) - { - m_timers[WUPDATE_WEATHERS].Reset(); - WeatherMgr::Update(uint32(m_timers[WUPDATE_WEATHERS].GetInterval())); - } - /// <li> Update uptime table if (m_timers[WUPDATE_UPTIME].Passed()) { diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index df44b05c88f..440bfe299de 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -71,7 +71,6 @@ enum WorldTimers { WUPDATE_AUCTIONS, WUPDATE_AUCTIONS_PENDING, - WUPDATE_WEATHERS, WUPDATE_UPTIME, WUPDATE_CORPSES, WUPDATE_EVENTS, |