From a7dd2635666ed3d138642676ea18b66c99c6213c Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Fri, 20 Jun 2025 23:11:33 +0200 Subject: [PATCH] Enable spigot obfuscation support (#12695) --- build-data/reobf-mappings-patch.tiny | 2 +- paper-server/build.gradle.kts | 6 +++--- .../main/java/io/papermc/paper/util/MappingEnvironment.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-data/reobf-mappings-patch.tiny b/build-data/reobf-mappings-patch.tiny index 55a1c0eabf3..f2361b6a90f 100644 --- a/build-data/reobf-mappings-patch.tiny +++ b/build-data/reobf-mappings-patch.tiny @@ -21,7 +21,7 @@ c net/minecraft/world/level/chunk/LevelChunk net/minecraft/world/level/chunk/Chu # See mappings-patch.tiny c net/minecraft/server/level/ChunkMap net/minecraft/server/level/PlayerChunkMap - f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager G + f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager H # The method is made public by Spigot, which then causes accidental overrides c net/minecraft/world/entity/Entity net/minecraft/world/entity/Entity diff --git a/paper-server/build.gradle.kts b/paper-server/build.gradle.kts index 6bf0eea403b..24aa9d6c2ca 100644 --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts @@ -25,9 +25,9 @@ paperweight { gitFilePatches = false spigot { - enabled = false - buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc" - packageVersion = "v1_21_R4" // also needs to be updated in MappingEnvironment + enabled = true + buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d" + packageVersion = "v1_21_R5" // also needs to be updated in MappingEnvironment } reobfPackagesToFix.addAll( diff --git a/paper-server/src/main/java/io/papermc/paper/util/MappingEnvironment.java b/paper-server/src/main/java/io/papermc/paper/util/MappingEnvironment.java index d22e477e3b1..42fd164349e 100644 --- a/paper-server/src/main/java/io/papermc/paper/util/MappingEnvironment.java +++ b/paper-server/src/main/java/io/papermc/paper/util/MappingEnvironment.java @@ -11,7 +11,7 @@ import org.checkerframework.framework.qual.DefaultQualifier; @DefaultQualifier(NonNull.class) public final class MappingEnvironment { public static final boolean DISABLE_PLUGIN_REMAPPING = Boolean.getBoolean("paper.disablePluginRemapping"); - public static final String LEGACY_CB_VERSION = "v1_21_R4"; + public static final String LEGACY_CB_VERSION = "v1_21_R5"; private static final @Nullable String MAPPINGS_HASH = readMappingsHash(); private static final boolean REOBF = checkReobf();