josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ResetInstance.

Browse Source 
Fixes issue #70.

Reset Instance was removed during the merge to 3.2.2, then fixed again, then backed-out due to bug. This latter is now fixed.
Thanks to the original authors (already credited in old rev).

--HG--
branch : trunk
This commit is contained in:
Trazom62
2010-02-04 22:03:09 +01:00
parent b0b261585f
commit 646fc8276a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/InstanceSaveMgr.cpp
+14 -2
View File
@@ -501,7 +501,9 @@ void InstanceSaveManager::LoadResetTimes()
continue; continue;
// the reset_delay must be at least one day // the reset_delay must be at least one day
uint32 period = (mapDiff->resetTime / DAY * sWorld.getRate(RATE_INSTANCE_RESET_TIME)) * DAY; uint32 period = ((mapDiff->resetTime * sWorld.getRate(RATE_INSTANCE_RESET_TIME))/DAY) * DAY;
if (period < DAY)
period = DAY;
time_t t = GetResetTimeFor(mapid,difficulty); time_t t = GetResetTimeFor(mapid,difficulty);
if(!t) if(!t)
@@ -529,6 +531,8 @@ void InstanceSaveManager::LoadResetTimes()
if(t - tim[type-1] > now) if(t - tim[type-1] > now)
break; break;
ScheduleReset(true, t - tim[type-1], InstResetEvent(type, mapid, difficulty, -1));
for(ResetTimeMapDiffInstances::const_iterator in_itr = mapDiffResetInstances.lower_bound(map_diff_pair); for(ResetTimeMapDiffInstances::const_iterator in_itr = mapDiffResetInstances.lower_bound(map_diff_pair);
in_itr != mapDiffResetInstances.upper_bound(map_diff_pair); ++in_itr) in_itr != mapDiffResetInstances.upper_bound(map_diff_pair); ++in_itr)
{ {
@@ -662,8 +666,16 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
// calculate the next reset time // calculate the next reset time
uint32 diff = sWorld.getConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR; uint32 diff = sWorld.getConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR;
uint32 period = mapDiff->resetTime * DAY;
uint32 period = ((mapDiff->resetTime * sWorld.getRate(RATE_INSTANCE_RESET_TIME))/DAY) * DAY;
if (period < DAY)
period = DAY;
uint64 next_reset = ((now + timeLeft + MINUTE) / DAY * DAY) + period + diff; uint64 next_reset = ((now + timeLeft + MINUTE) / DAY * DAY) + period + diff;
SetResetTimeFor(mapid, difficulty, next_reset);
ScheduleReset(true, time_t(next_reset-3600), InstResetEvent(1, mapid, difficulty, -1));
// update it in the DB // update it in the DB
CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%d' AND difficulty = '%d'", next_reset, mapid, difficulty); CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%d' AND difficulty = '%d'", next_reset, mapid, difficulty);
} }