Fix old worlds

This commit is contained in:
GabsPuNs
2026-03-23 02:02:02 -04:00
parent 4acbe79ac0
commit e979cb50c5
2 changed files with 15 additions and 3 deletions

View File

@@ -200,11 +200,16 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
header.ReadHeader( pvSaveMem, plat );
if (bLevelGenBaseSave)
{
header.AddFile(L"region_format_16");
}
}
else
{
// Clear the first 8 bytes that reference the header
header.WriteHeader( pvSaveMem );
header.AddFile(L"region_format_16");
}
}

View File

@@ -31,7 +31,12 @@ RegionFile *RegionFileCache::_getRegionFile(ConsoleSaveFile *saveFile, const wst
File file;
if(useSplitSaves(saveFile->getSavePlatform()))
{
file = File( prefix + wstring(L"r.") + std::to_wstring(chunkX>>4) + L"." + std::to_wstring(chunkZ>>4) + L".mcr" );
bool isNew = saveFile->doesFileExist(ConsoleSavePath(L"region_format_16"));
if (isNew)
file = File(prefix + wstring(L"r.") + std::to_wstring(chunkX >> 4) + L"." + std::to_wstring(chunkZ >> 4) + L".mcr");
else
file = File(prefix + wstring(L"r.") + std::to_wstring(chunkX >> 5) + L"." + std::to_wstring(chunkZ >> 5) + L".mcr");
}
else
{
@@ -91,7 +96,8 @@ int RegionFileCache::_getSizeDelta(ConsoleSaveFile *saveFile, const wstring &pre
DataInputStream *RegionFileCache::_getChunkDataInputStream(ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ)
{
RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, chunkZ);
if(useSplitSaves(saveFile->getSavePlatform()))
bool isNew = saveFile->doesFileExist(ConsoleSavePath(L"region_format_16"));
if (useSplitSaves(saveFile->getSavePlatform()) && isNew)
{
return r->getChunkDataInputStream(chunkX & 15, chunkZ & 15);
}
@@ -105,7 +111,8 @@ DataInputStream *RegionFileCache::_getChunkDataInputStream(ConsoleSaveFile *save
DataOutputStream *RegionFileCache::_getChunkDataOutputStream(ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ)
{
RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, chunkZ);
if(useSplitSaves(saveFile->getSavePlatform()))
bool isNew = saveFile->doesFileExist(ConsoleSavePath(L"region_format_16"));
if (useSplitSaves(saveFile->getSavePlatform()) && isNew)
{
return r->getChunkDataOutputStream(chunkX & 15, chunkZ & 15);
}