mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 11:27:35 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
40 lines
2.4 KiB
Diff
40 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Astralchroma <astralchroma@proton.me>
|
|
Date: Thu, 27 Oct 2022 22:19:31 +0100
|
|
Subject: [PATCH] Configurable Region Compression Format
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
|
|
index f1237f6fd6414900ffbad0caee31aa83310eeef4..e858436bcf1b234d4bc6e6a117f5224d5c2d9f90 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
|
|
@@ -50,7 +50,7 @@ public class RegionFile implements AutoCloseable {
|
|
protected final RegionBitmap usedSectors;
|
|
|
|
public RegionFile(RegionStorageInfo storageKey, Path directory, Path path, boolean dsync) throws IOException {
|
|
- this(storageKey, directory, path, RegionFileVersion.getSelected(), dsync);
|
|
+ this(storageKey, directory, path, RegionFileVersion.getCompressionFormat(), dsync); // Paper - Configurable region compression format
|
|
}
|
|
|
|
public RegionFile(RegionStorageInfo storageKey, Path path, Path directory, RegionFileVersion compressionFormat, boolean dsync) throws IOException {
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
|
|
index cbd892598287c9358c1c2a3840c517462820b389..ef68b57ef1d8d7cb317c417569dd23a777fba4ad 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
|
|
@@ -58,6 +58,15 @@ public class RegionFileVersion {
|
|
private final RegionFileVersion.StreamWrapper<InputStream> inputWrapper;
|
|
private final RegionFileVersion.StreamWrapper<OutputStream> outputWrapper;
|
|
|
|
+ // Paper start - Configurable region compression format
|
|
+ public static RegionFileVersion getCompressionFormat() {
|
|
+ return switch (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.compressionFormat) {
|
|
+ case GZIP -> VERSION_GZIP;
|
|
+ case ZLIB -> VERSION_DEFLATE;
|
|
+ case NONE -> VERSION_NONE;
|
|
+ };
|
|
+ }
|
|
+ // Paper end - Configurable region compression format
|
|
private RegionFileVersion(
|
|
int id,
|
|
@Nullable String name,
|