LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-27 13:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove HANDLE from zoned chunk storage headers

Browse Source
This commit is contained in:
notmatthewbeshay
2026-03-09 23:57:50 +11:00
parent 37d9439be3
commit 22757b4b51
6 changed files with 127 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Minecraft.World/Level/Storage/ZoneFile.cpp
View File

@@ -3,6 +3,28 @@
#include "../../IO/Files/File.h"
#include "ZoneFile.h"
namespace
{
std::FILE *OpenBinaryFileForReadWrite(const File &file)
{
#if defined(_WIN32)
std::FILE *stream = _wfopen(file.getPath().c_str(), L"r+b");
if (stream == NULL)
{
stream = _wfopen(file.getPath().c_str(), L"w+b");
}
#else
const std::string nativePath = wstringtofilename(file.getPath());
std::FILE *stream = std::fopen(nativePath.c_str(), "r+b");
if (stream == NULL)
{
stream = std::fopen(nativePath.c_str(), "w+b");
}
#endif
return stream;
}
}
const int ZoneFile::slotsLength = ZonedChunkStorage::CHUNKS_PER_ZONE * ZonedChunkStorage::CHUNKS_PER_ZONE;
@@ -23,7 +45,7 @@ ZoneFile::ZoneFile(__int64 key, File file, File entityFile) : slots(slotsLength)
// this.entityFile = new NbtSlotFile(entityFile);
// }
channel = CreateFile(wstringtofilename(file.getPath()), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
channel = OpenBinaryFileForReadWrite(file);
// 4J - try/catch removed
// try {
readHeader();
@@ -71,7 +93,11 @@ void ZoneFile::writeHeader()
void ZoneFile::close()
{
CloseHandle(channel);
if (channel != NULL)
{
std::fclose(channel);
channel = NULL;
}
entityFile->close();
}
@@ -89,4 +115,4 @@ ZoneIo *ZoneFile::getZoneIo(int slot)
bool ZoneFile::containsSlot(int slot)
{
return slots[slot] > 0;
}
}