Merge branch 'DarkflameUniverse:main' into main

This commit is contained in:
Nils Bergmann
2022-01-05 16:33:13 +01:00
committed by GitHub
31 changed files with 177 additions and 61 deletions

View File

@@ -651,7 +651,7 @@ void HandlePacket(Packet* packet) {
}
case MSG_MASTER_SHUTDOWN_UNIVERSE: {
Game::logger->Log("MasterServer","Received shutdown universe command, ""shutting down in 10 minutes.\n");
Game::logger->Log("MasterServer","Received shutdown universe command, shutting down in 10 minutes.\n");
shouldShutdown = true;
break;
}
@@ -713,7 +713,7 @@ void ShutdownSequence() {
auto* objIdManager = ObjectIDManager::TryInstance();
if (objIdManager != nullptr) {
objIdManager->SaveToDatabase();
printf("Saved objidtracker...\n");
Game::logger->Log("MasterServer", "Saved ObjectIDTracker to DB\n");
}
auto t = std::chrono::high_resolution_clock::now();
@@ -723,7 +723,8 @@ void ShutdownSequence() {
exit(0);
}
printf("Attempting to shutdown instances, max 60 seconds...\n");
Game::logger->Log("MasterServer", "Attempting to shutdown instances, max 60 seconds...\n");
while (true) {
auto done = true;