backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed DLC files not saving correctly

Browse source
This commit is contained in:
Marvelco 2026-03-12 05:06:35 +02:00
parent 1036b7368e
commit f3910e7bb7
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.World/ConsoleSaveFileOriginal.cpp
View file

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

13
Minecraft.World/RegionFileCache.cpp
View file

@ -35,7 +35,12 @@ RegionFile *RegionFileCache::_getRegionFile(ConsoleSaveFile *saveFile, const wst
File file; File file;
if(useSplitSaves(saveFile->getSavePlatform())) 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 else
{ {
@ -95,7 +100,8 @@ int RegionFileCache::_getSizeDelta(ConsoleSaveFile *saveFile, const wstring &pre
DataInputStream *RegionFileCache::_getChunkDataInputStream(ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ) DataInputStream *RegionFileCache::_getChunkDataInputStream(ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ)
{ {
RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, 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); return r->getChunkDataInputStream(chunkX & 15, chunkZ & 15);
} }
@ -109,7 +115,8 @@ DataInputStream *RegionFileCache::_getChunkDataInputStream(ConsoleSaveFile *save
DataOutputStream *RegionFileCache::_getChunkDataOutputStream(ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ) DataOutputStream *RegionFileCache::_getChunkDataOutputStream(ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ)
{ {
RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, 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); return r->getChunkDataOutputStream(chunkX & 15, chunkZ & 15);
} }