LCEMP commit: multiple savefile fixes
This commit is contained in:
13 files changed
+94
-32
No files matched your search
@@ -143,7 +143,9 @@ bool NetworkSocketLayer::Initialize()
|
||||
|
||||
s_initialized = true;
|
||||
|
||||
#ifndef _DEDICATED_SERVER
|
||||
StartDiscovery();
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1634,6 +1634,33 @@ void MinecraftServer::tick()
|
||||
|
||||
tickCount++;
|
||||
|
||||
#ifdef _DEDICATED_SERVER
|
||||
if (tickCount % 6000 == 0 && !s_bServerHalted)
|
||||
{
|
||||
app.DebugPrintf("Auto-saving world...\n");
|
||||
if (players != NULL)
|
||||
{
|
||||
players->saveAll(NULL);
|
||||
}
|
||||
for (unsigned int j = 0; j < levels.length; j++)
|
||||
{
|
||||
if (s_bServerHalted) break;
|
||||
ServerLevel *level = levels[levels.length - 1 - j];
|
||||
if (level) level->save(false, NULL, true);
|
||||
}
|
||||
if (!s_bServerHalted)
|
||||
{
|
||||
saveGameRules();
|
||||
levels[0]->saveToDisc(NULL, true);
|
||||
}
|
||||
while (StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle)
|
||||
{
|
||||
Sleep(10);
|
||||
}
|
||||
app.DebugPrintf("Auto-save complete\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
// 4J We need to update client difficulty levels based on the servers
|
||||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||||
// 4J-PB - sending this on the host changing the difficulty in the menus
|
||||
|
||||
@@ -175,10 +175,11 @@ LevelChunk *MultiPlayerChunkCache::create(int x, int z)
|
||||
if (MinecraftServer::getInstance()->serverHalted()) return NULL;
|
||||
|
||||
// If we're the host, then don't create the chunk, share data from the server's copy
|
||||
int dimId = level->dimension->id;
|
||||
#ifdef _LARGE_WORLDS
|
||||
LevelChunk *serverChunk = MinecraftServer::getInstance()->getLevel(level->dimension->id)->cache->getChunkLoadedOrUnloaded(x,z);
|
||||
LevelChunk *serverChunk = MinecraftServer::getInstance()->getLevel(dimId)->cache->getChunkLoadedOrUnloaded(x,z);
|
||||
#else
|
||||
LevelChunk *serverChunk = MinecraftServer::getInstance()->getLevel(level->dimension->id)->cache->getChunk(x,z);
|
||||
LevelChunk *serverChunk = MinecraftServer::getInstance()->getLevel(dimId)->cache->getChunk(x,z);
|
||||
#endif
|
||||
chunk = new LevelChunk(level, x, z, serverChunk);
|
||||
// Let renderer know that this chunk has been created - it might have made render data from the EmptyChunk if it got to a chunk before the server sent it
|
||||
|
||||
@@ -151,8 +151,10 @@ LevelChunk *ServerChunkCache::create(int x, int z, bool asyncPostProcess) // 4J
|
||||
|
||||
if( ( chunk == NULL ) || ( chunk->x != x ) || ( chunk->z != z ) )
|
||||
{
|
||||
bool wasLoaded = false;
|
||||
EnterCriticalSection(&m_csLoadCreate);
|
||||
chunk = load(x, z);
|
||||
wasLoaded = (chunk != NULL);
|
||||
if (chunk == NULL)
|
||||
{
|
||||
if (source == NULL)
|
||||
|
||||
Reference in new issue
Block a user