Paper/patch-remap/mache-spigotflower-stripped/net/minecraft/util/datafix/DataFixers.java.patch

30 lines
1.7 KiB
Diff

--- a/net/minecraft/util/datafix/DataFixers.java
+++ b/net/minecraft/util/datafix/DataFixers.java
@@ -455,10 +279,22 @@
datafixerbuilder.addFixer(new EntityItemFrameDirectionFix(schema44, false));
Schema schema45 = datafixerbuilder.addSchema(1458, DataFixers.SAME_NAMESPACED);
- datafixerbuilder.addFixer(new EntityCustomNameToComponentFix(schema45, false));
- datafixerbuilder.addFixer(new ItemCustomNameToComponentFix(schema45, false));
- datafixerbuilder.addFixer(new BlockEntityCustomNameToComponentFix(schema45, false));
- Schema schema46 = datafixerbuilder.addSchema(1460, V1460::new);
+ // CraftBukkit start
+ builder.addFixer(new com.mojang.datafixers.DataFix(schema45, false) {
+ @Override
+ protected com.mojang.datafixers.TypeRewriteRule makeRule() {
+ return this.fixTypeEverywhereTyped("Player CustomName", this.getInputSchema().getType(DataConverterTypes.PLAYER), (typed) -> {
+ return typed.update(DSL.remainderFinder(), (dynamic) -> {
+ return EntityCustomNameToComponentFix.fixTagCustomName(dynamic);
+ });
+ });
+ }
+ });
+ // CraftBukkit end
+ builder.addFixer(new EntityCustomNameToComponentFix(schema45, false));
+ builder.addFixer(new ItemCustomNameToComponentFix(schema45, false));
+ builder.addFixer(new BlockEntityCustomNameToComponentFix(schema45, false));
+ Schema schema46 = builder.addSchema(1460, V1460::new);
datafixerbuilder.addFixer(new EntityPaintingMotiveFix(schema46, false));
Schema schema47 = datafixerbuilder.addSchema(1466, V1466::new);