diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-07-19 21:24:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 21:24:56 +0200 |
| commit | aeddd417c460c43d885cb89ceaa6e051c44b1d27 (patch) | |
| tree | 589e76b3c39940dec7e8db8240224220d4893090 /src/server/game/World | |
| parent | fbd0fe26ee239f7cf80004d771b96df3f9ae1274 (diff) | |
Core/Misc: Handle timezones for hour-specific events specifieds in worldserver.conf (#23540)
* Core/Misc: Handle timezones for hour-specific events specifieds in worldserver.conf
* Handle Respawn.RestartQuietTime too
* Handle XP.Boost.Daymask too
* Core/Misc: Code cleanup
* Core/Misc: Code cleanup
* Update Util.cpp
* Update boosted_xp.cpp
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index c511c85f0d4..d719442f9f7 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -230,11 +230,11 @@ void World::TriggerGuidWarning() time_t today = (gameTime / DAY) * DAY; // Check if our window to restart today has passed. 5 mins until quiet time - while (gameTime >= (today + (getIntConfig(CONFIG_RESPAWN_RESTARTQUIETTIME) * HOUR) - 1810)) + while (gameTime >= GetLocalHourTimestamp(today, getIntConfig(CONFIG_RESPAWN_RESTARTQUIETTIME)) - 1810) today += DAY; // Schedule restart for 30 minutes before quiet time, or as long as we have - _warnShutdownTime = today + (getIntConfig(CONFIG_RESPAWN_RESTARTQUIETTIME) * HOUR) - 1800; + _warnShutdownTime = GetLocalHourTimestamp(today, getIntConfig(CONFIG_RESPAWN_RESTARTQUIETTIME)) - 1800; _guidWarn = true; SendGuidWarning(); |