Skip to content

Commit ffd5158

Browse files
authored
Update 1.21.9 reobf mappings data (#13135)
1 parent 4dcd837 commit ffd5158

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

build-data/reobf-mappings-patch.tiny

Lines changed: 3 additions & 3 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 L
17+
f Lnet/minecraft/world/level/storage/PrimaryLevelData; serverLevelData J
1818

1919
c net/minecraft/world/level/chunk/LevelChunk net/minecraft/world/level/chunk/Chunk
20-
f Lnet/minecraft/server/level/ServerLevel; level r
20+
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 H
24+
f Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager; distanceManager G
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
@@ -3,7 +3,7 @@ version=1.21.9-R0.1-SNAPSHOT
33
mcVersion=1.21.9
44

55
# Set to true while updating Minecraft version
6-
updatingMinecraft=true
6+
updatingMinecraft=false
77

88
org.gradle.configuration-cache=true
99
org.gradle.caching=true

paper-server/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ paperweight {
2727
gitFilePatches = false
2828

2929
spigot {
30-
enabled = false
31-
buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
32-
packageVersion = "v1_21_R5" // also needs to be updated in MappingEnvironment
30+
enabled = true
31+
buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
32+
packageVersion = "v1_21_R6" // also needs to be updated in MappingEnvironment
3333
}
3434

3535
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_R5";
14+
public static final String LEGACY_CB_VERSION = "v1_21_R6";
1515
private static final @Nullable String MAPPINGS_HASH = readMappingsHash();
1616
private static final boolean REOBF = checkReobf();
1717

0 commit comments

Comments
 (0)