ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core: Better fix for stuck at "Retrieving character list"

Browse source 
also fix instance lock always delayed and never expiring

close: #966
This commit is contained in:
talamortis 2018-09-28 18:33:17 +01:00
parent b68354858f
commit c4a6445a23
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/game/Instances/InstanceSaveMgr.cpp
View file

@ -214,6 +214,9 @@ void InstanceSaveManager::LoadInstances()
// Delete instance with no binds
CharacterDatabase.DirectExecute("DELETE i.* FROM instance AS i LEFT JOIN character_instance AS ci ON i.id = ci.instance WHERE ci.guid IS NULL");
// Delete Instance_reset so it can generate a new patch for this
CharacterDatabase.DirectExecute("DELETE FROM instance_reset");
// Delete creature_respawn, gameobject_respawn and creature_instance for non-existent instance
CharacterDatabase.DirectExecute("DELETE FROM creature_respawn WHERE instanceId > 0 AND instanceId NOT IN (SELECT id FROM instance)");
CharacterDatabase.DirectExecute("DELETE FROM gameobject_respawn WHERE instanceId > 0 AND instanceId NOT IN (SELECT id FROM instance)");
@ -290,12 +293,7 @@ void InstanceSaveManager::LoadResetTimes()
SetResetTimeFor(mapid, difficulty, t);
CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u', '%u', '%u')", mapid, difficulty, (uint32)t);
}
else
{
// next reset should be in future. If its not, skip to future.
while (t < now)
t = uint32(((t + MINUTE) / DAY * DAY) + period + diff);
}
SetExtendedResetTimeFor(mapid, difficulty, t + period);
// schedule the global reset/warning