Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-22 16:29:23 +00:00
Code Issues Releases Activity

fix critical bug

Browse Source
This commit is contained in:
NONPLAYT
2024-04-17 02:35:13 +03:00
parent 145e563fc3
commit 6f72fa0c02
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0040-Implement-Linear-region-format.patch
View File

@@ -362,7 +362,7 @@ index 6cf83502a954cce9c562ec036bfeddb477d38b73..a344a9528289e39322758ac6174c3409
try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) { try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) {
return NbtIo.read((java.io.DataInput) out); return NbtIo.read((java.io.DataInput) out);
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
index fe312b1aef579cb4bf81bdd967cf72ff880d7505..cc8c80edcb1931da0c7efbcd8143d5a327fc2a8c 100644 index fe312b1aef579cb4bf81bdd967cf72ff880d7505..83a0fddd4cc4f928b604f61b1ec719277c526c9c 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -19,11 +19,17 @@ import net.minecraft.world.level.ChunkPos; @@ -19,11 +19,17 @@ import net.minecraft.world.level.ChunkPos;
@@ -454,7 +454,7 @@ index fe312b1aef579cb4bf81bdd967cf72ff880d7505..cc8c80edcb1931da0c7efbcd8143d5a3
// Paper end // Paper end
long i = ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()); final long regionPos = i; // Paper - OBFHELPER long i = ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()); final long regionPos = i; // Paper - OBFHELPER
- RegionFile regionfile = (RegionFile) this.regionCache.getAndMoveToFirst(i); - RegionFile regionfile = (RegionFile) this.regionCache.getAndMoveToFirst(i);
+ space.bxteam.divinemc.region.AbstractRegionFile regionfile = (RegionFile) this.regionCache.getAndMoveToFirst(i); // DivineMC + space.bxteam.divinemc.region.AbstractRegionFile regionfile = this.regionCache.getAndMoveToFirst(i); // DivineMC
if (regionfile != null) { if (regionfile != null) {
// Paper start // Paper start
@@ -791,10 +791,10 @@ index 0000000000000000000000000000000000000000..c7a2a382e9e5bcfd8b502d43cbcea413
+} +}
diff --git a/src/main/java/space/bxteam/divinemc/region/LinearRegionFile.java b/src/main/java/space/bxteam/divinemc/region/LinearRegionFile.java diff --git a/src/main/java/space/bxteam/divinemc/region/LinearRegionFile.java b/src/main/java/space/bxteam/divinemc/region/LinearRegionFile.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..ebda2e1078fd70cf120430b1c1f68247fc122e10 index 0000000000000000000000000000000000000000..cdb82aba7c83b8a1ac844743f0932f46fd51eeac
--- /dev/null --- /dev/null
+++ b/src/main/java/space/bxteam/divinemc/region/LinearRegionFile.java +++ b/src/main/java/space/bxteam/divinemc/region/LinearRegionFile.java
@@ -0,0 +1,316 @@ @@ -0,0 +1,315 @@
+package space.bxteam.divinemc.region; +package space.bxteam.divinemc.region;
+ +
+import com.github.luben.zstd.ZstdInputStream; +import com.github.luben.zstd.ZstdInputStream;
@@ -845,7 +845,6 @@ index 0000000000000000000000000000000000000000..ebda2e1078fd70cf120430b1c1f68247
+ public boolean closed = false; + public boolean closed = false;
+ public Path path; + public Path path;
+ +
+
+ public LinearRegionFile(Path file, int compression) throws IOException { + public LinearRegionFile(Path file, int compression) throws IOException {
+ this.path = file; + this.path = file;
+ this.compressionLevel = compression; + this.compressionLevel = compression;