diff options
| author | Jason Penilla <[email protected]> | 2023-12-11 22:08:51 -0800 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2023-12-11 22:08:51 -0800 |
| commit | 0fadaed0783782877502a24fac53a63753959191 (patch) | |
| tree | 30a59de90094cd72a83ae42267c2ed196be67935 /patches/server/0010-Adventure.patch | |
| parent | 7c2dc4b3429f16943300da0eb06100e910ad832e (diff) | |
| download | Paper-0fadaed0783782877502a24fac53a63753959191.tar.gz Paper-0fadaed0783782877502a24fac53a63753959191.zip | |
[ci skip] move decomp fixes to correct patch
Diffstat (limited to 'patches/server/0010-Adventure.patch')
| -rw-r--r-- | patches/server/0010-Adventure.patch | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index 49b0841e1c..5549de0b8d 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -2270,7 +2270,7 @@ index d3a80d0a23be762c05931ae8001d98e43cab2b4a..e0037b99838519eee5fb6f7e95ffaad2 } } diff --git a/src/main/java/net/minecraft/network/chat/ComponentSerialization.java b/src/main/java/net/minecraft/network/chat/ComponentSerialization.java -index 60228c3778e53ca5c513cd265e5e08d151573a4f..ddc91d376fd59da982e594188fcef7202a2a5972 100644 +index 49138ccda0f378b13c7f425be765876eb4026b06..ddc91d376fd59da982e594188fcef7202a2a5972 100644 --- a/src/main/java/net/minecraft/network/chat/ComponentSerialization.java +++ b/src/main/java/net/minecraft/network/chat/ComponentSerialization.java @@ -61,6 +61,33 @@ public class ComponentSerialization { @@ -2307,24 +2307,6 @@ index 60228c3778e53ca5c513cd265e5e08d151573a4f..ddc91d376fd59da982e594188fcef720 return Codec.either(Codec.either(Codec.STRING, ExtraCodecs.nonEmptyList(selfCodec.listOf())), codec).xmap((either) -> { return either.map((either2) -> { return either2.map(Component::literal, ComponentSerialization::createFromList); -@@ -86,7 +113,7 @@ public class ComponentSerialization { - for(MapDecoder<? extends T> mapDecoder : this.codecs) { - DataResult<? extends T> dataResult = mapDecoder.decode(dynamicOps, mapLike); - if (dataResult.result().isPresent()) { -- return dataResult; -+ return (DataResult<T>) dataResult; // Paper - decomp fix - } - } - -@@ -96,7 +123,7 @@ public class ComponentSerialization { - } - - public <S> RecordBuilder<S> encode(T object, DynamicOps<S> dynamicOps, RecordBuilder<S> recordBuilder) { -- MapEncoder<T> mapEncoder = this.encoderGetter.apply(object); -+ MapEncoder<T> mapEncoder = (MapEncoder<T>) this.encoderGetter.apply(object); // Paper - decomp fix - return mapEncoder.encode(object, dynamicOps, recordBuilder); - } - diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java index b6506e881ef337bfd2a7a0644296b48b7300a0f6..7daca712816a79cc4a30b084afbd3d07b5d3755f 100644 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java |