sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Core: Better fix for stuck at "Retrieving character list"" (#1040)

Browse Source 
This reverts commit c4a6445a23.
This commit is contained in:
Barbz
2018-09-30 01:05:51 +02:00
committed by GitHub
parent 841f4fea59
commit 1d5407a9d9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Instances/InstanceSaveMgr.cpp
+6 -4
View File
@@ -214,9 +214,6 @@ void InstanceSaveManager::LoadInstances()
// Delete instance with no binds // 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"); 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 // 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 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)"); CharacterDatabase.DirectExecute("DELETE FROM gameobject_respawn WHERE instanceId > 0 AND instanceId NOT IN (SELECT id FROM instance)");
@@ -293,7 +290,12 @@ void InstanceSaveManager::LoadResetTimes()
SetResetTimeFor(mapid, difficulty, t); SetResetTimeFor(mapid, difficulty, t);
CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u', '%u', '%u')", mapid, difficulty, (uint32)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); SetExtendedResetTimeFor(mapid, difficulty, t + period);
// schedule the global reset/warning // schedule the global reset/warning