Skip to content

Commit 6da8af7

Browse files
authored
Update 1.21.11 reobf mapping data (#13388)
1 parent b6b53a6 commit 6da8af7

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

build-data/reobf-mappings-patch.tiny

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ tiny 2 0 mojang spigot
1414

1515
# CraftBukkit changes type
1616
c net/minecraft/server/level/ServerLevel net/minecraft/server/level/WorldServer
17-
f Lnet/minecraft/world/level/storage/PrimaryLevelData; serverLevelData J
17+
f Lnet/minecraft/world/level/storage/PrimaryLevelData; serverLevelData I
1818

1919
c net/minecraft/world/level/chunk/LevelChunk net/minecraft/world/level/chunk/Chunk
2020
f Lnet/minecraft/server/level/ServerLevel; level q
2121

2222
# See mappings-patch.tiny
2323
c net/minecraft/server/level/ChunkMap net/minecraft/server/level/PlayerChunkMap
24-
f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager G
24+
f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager D
2525

2626
# The method is made public by Spigot, which then causes accidental overrides
2727
c net/minecraft/world/entity/Entity net/minecraft/world/entity/Entity

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mcVersion=1.21.11
66
apiVersion=1.21.11
77

88
# Set to true while updating Minecraft version
9-
updatingMinecraft=true
9+
updatingMinecraft=false
1010

1111
org.gradle.configuration-cache=true
1212
org.gradle.caching=true

paper-server/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ paperweight {
2323
gitFilePatches = false
2424

2525
spigot {
26-
enabled = false
27-
buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
28-
packageVersion = "v1_21_R6" // also needs to be updated in MappingEnvironment
26+
enabled = true
27+
buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
28+
packageVersion = "v1_21_R7" // also needs to be updated in MappingEnvironment
2929
}
3030

3131
reobfPackagesToFix.addAll(

paper-server/src/main/java/io/papermc/paper/util/MappingEnvironment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@DefaultQualifier(NonNull.class)
1212
public final class MappingEnvironment {
1313
public static final boolean DISABLE_PLUGIN_REMAPPING = Boolean.getBoolean("paper.disablePluginRemapping");
14-
public static final String LEGACY_CB_VERSION = "v1_21_R6";
14+
public static final String LEGACY_CB_VERSION = "v1_21_R7";
1515
private static final @Nullable String MAPPINGS_HASH = readMappingsHash();
1616
private static final boolean REOBF = checkReobf();
1717

0 commit comments

Comments
 (0)