diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/boosted_xp.cpp | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 741a3e98697..adaa84c631d 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -358,7 +358,7 @@ void InstanceSaveManager::LoadResetTimes() } // load the global respawn times for raid/heroic instances - uint32 diff = sWorld->getIntConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR; + uint32 resetHour = sWorld->getIntConfig(CONFIG_INSTANCE_RESET_TIME_HOUR); if (QueryResult result = CharacterDatabase.Query("SELECT mapid, difficulty, resettime FROM instance_reset")) { do @@ -381,7 +381,7 @@ void InstanceSaveManager::LoadResetTimes() } // update the reset time if the hour in the configs changes - uint64 newresettime = (oldresettime / DAY) * DAY + diff; + uint64 newresettime = GetLocalHourTimestamp(oldresettime, resetHour, false); if (oldresettime != newresettime) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GLOBAL_INSTANCE_RESETTIME); @@ -417,7 +417,7 @@ void InstanceSaveManager::LoadResetTimes() if (!t) { // initialize the reset time - t = today + period + diff; + t = GetLocalHourTimestamp(today + period, resetHour); CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GLOBAL_INSTANCE_RESETTIME); stmt->setUInt16(0, uint16(mapid)); @@ -430,8 +430,8 @@ void InstanceSaveManager::LoadResetTimes() { // assume that expired instances have already been cleaned // calculate the next reset time - t = (t / DAY) * DAY; - t += ((today - t) / period + 1) * period + diff; + time_t day = (t / DAY) * DAY; + t = GetLocalHourTimestamp(day + ((today - day) / period + 1) * period, resetHour); CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GLOBAL_INSTANCE_RESETTIME); stmt->setInt64(0, t); @@ -466,12 +466,12 @@ time_t InstanceSaveManager::GetSubsequentResetTime(uint32 mapid, Difficulty diff return 0; } - time_t diff = sWorld->getIntConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR; + time_t resetHour = sWorld->getIntConfig(CONFIG_INSTANCE_RESET_TIME_HOUR); time_t period = uint32(((mapDiff->GetRaidDuration() * sWorld->getRate(RATE_INSTANCE_RESET_TIME)) / DAY) * DAY); if (period < DAY) period = DAY; - return ((resetTime + MINUTE) / DAY * DAY) + period + diff; + return GetLocalHourTimestamp(((resetTime + MINUTE) / DAY * DAY) + period, resetHour); } void InstanceSaveManager::SetResetTimeFor(uint32 mapid, Difficulty d, time_t t) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 97311508ebb..87b8ad5a3ec 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -258,11 +258,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(); diff --git a/src/server/scripts/World/boosted_xp.cpp b/src/server/scripts/World/boosted_xp.cpp index d65a1b812c2..240dc4b34f7 100644 --- a/src/server/scripts/World/boosted_xp.cpp +++ b/src/server/scripts/World/boosted_xp.cpp @@ -17,17 +17,17 @@ #include "GameTime.h" #include "ScriptMgr.h" +#include "Util.h" #include "World.h" -#include <boost/date_time/posix_time/posix_time.hpp> - namespace { bool IsXPBoostActive() { - auto now = boost::posix_time::to_tm(boost::posix_time::from_time_t(GameTime::GetGameTime())); + time_t time = GameTime::GetGameTime(); + tm localTm = TimeBreakdown(time); uint32 weekdayMaskBoosted = sWorld->getIntConfig(CONFIG_XP_BOOST_DAYMASK); - uint32 weekdayMask = (1 << now.tm_wday); + uint32 weekdayMask = (1 << localTm.tm_wday); bool currentDayBoosted = (weekdayMask & weekdayMaskBoosted) != 0; return currentDayBoosted; } |