twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-17 13:24:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

compression level change with config option (#9711)

Browse Source
This commit is contained in:
leguan
2023-09-14 13:11:19 +02:00
parent f4883a8c07
commit 9466e0d55a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
patches/server/Paper-config-files.patch
View File

@@ -449,6 +449,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import co.aikar.timings.MinecraftTimings; +import co.aikar.timings.MinecraftTimings;
+import io.papermc.paper.configuration.constraint.Constraint; +import io.papermc.paper.configuration.constraint.Constraint;
+import io.papermc.paper.configuration.constraint.Constraints; +import io.papermc.paper.configuration.constraint.Constraints;
+import io.papermc.paper.configuration.type.IntOr;
+import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.NamedTextColor;
+import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.Packet;
@@ -725,6 +726,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public boolean useAlternativeLuckFormula = false; + public boolean useAlternativeLuckFormula = false;
+ public boolean useDimensionTypeForCustomSpawners = false; + public boolean useDimensionTypeForCustomSpawners = false;
+ public boolean strictAdvancementDimensionCheck = false; + public boolean strictAdvancementDimensionCheck = false;
+ public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
+ } + }
+ +
+ public BlockUpdates blockUpdates; + public BlockUpdates blockUpdates;
@@ -1129,7 +1131,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private static ConfigurationOptions defaultGlobalOptions(ConfigurationOptions options) { + private static ConfigurationOptions defaultGlobalOptions(ConfigurationOptions options) {
+ return options + return options
+ .header(GLOBAL_HEADER) + .header(GLOBAL_HEADER)
+ .serializers(builder -> builder.register(new PacketClassSerializer())); + .serializers(builder -> builder
+ .register(new PacketClassSerializer())
+ .register(IntOr.Default.SERIALIZER)
+ );
+ } + }
+ +
+ @Override + @Override

2
patches/server/Use-Velocity-compression-and-cipher-natives.patch
View File

@@ -308,7 +308,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public void setupCompression(int compressionThreshold, boolean rejectsBadPackets) { public void setupCompression(int compressionThreshold, boolean rejectsBadPackets) {
if (compressionThreshold >= 0) { if (compressionThreshold >= 0) {
+ com.velocitypowered.natives.compression.VelocityCompressor compressor = com.velocitypowered.natives.util.Natives.compress.get().create(-1); // Paper + com.velocitypowered.natives.compression.VelocityCompressor compressor = com.velocitypowered.natives.util.Natives.compress.get().create(io.papermc.paper.configuration.GlobalConfiguration.get().misc.compressionLevel.or(-1)); // Paper
if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) { if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
((CompressionDecoder) this.channel.pipeline().get("decompress")).setThreshold(compressionThreshold, rejectsBadPackets); ((CompressionDecoder) this.channel.pipeline().get("decompress")).setThreshold(compressionThreshold, rejectsBadPackets);
} else { } else {