diff options
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 14 |
1 files changed, 7 insertions, 7 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) |