diff options
| author | Jake Potrebic <[email protected]> | 2023-03-14 17:06:28 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2023-03-14 17:06:28 -0700 |
| commit | 3e54639d9ce3098084bb7f520e022e57eb4e6e6b (patch) | |
| tree | e3a7b0ec9fd3ce0cebeec2712222ffaca23fc736 /patches/server/0006-MC-Dev-fixes.patch | |
| parent | c225146bc910113226bb56defa3afe766152337d (diff) | |
| download | Paper-3e54639d9ce3098084bb7f520e022e57eb4e6e6b.tar.gz Paper-3e54639d9ce3098084bb7f520e022e57eb4e6e6b.zip | |
readd exploded block state patch
Diffstat (limited to 'patches/server/0006-MC-Dev-fixes.patch')
| -rw-r--r-- | patches/server/0006-MC-Dev-fixes.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index 92b19f7969..d8edf09358 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -119,19 +119,6 @@ index 2f66abf62d303342f5fe614fb3e35e7844497ffc..b346fa94b23d81da7da073f71dd12e67 } } -diff --git a/src/main/java/net/minecraft/util/ExtraCodecs.java b/src/main/java/net/minecraft/util/ExtraCodecs.java -index 6dede9fb8ce33e6f7a6a6d06789d9638ce8c579d..128353b6cad685689403bd1757cc9cc7cc1091d1 100644 ---- a/src/main/java/net/minecraft/util/ExtraCodecs.java -+++ b/src/main/java/net/minecraft/util/ExtraCodecs.java -@@ -227,7 +227,7 @@ public class ExtraCodecs { - }, (pair) -> { - return ImmutableList.of(leftFunction.apply(pair), rightFunction.apply(pair)); - }); -- Codec<I> codec3 = RecordCodecBuilder.<Pair>create((instance) -> { -+ Codec<I> codec3 = RecordCodecBuilder.<Pair<P, P>>create((instance) -> { // Paper - decompile fix - return instance.group(codec.fieldOf(leftFieldName).forGetter(Pair::getFirst), codec.fieldOf(rightFieldName).forGetter(Pair::getSecond)).apply(instance, Pair::of); - }).comapFlatMap((pair) -> { - return combineFunction.apply((P)pair.getFirst(), (P)pair.getSecond()); diff --git a/src/main/java/net/minecraft/util/SortedArraySet.java b/src/main/java/net/minecraft/util/SortedArraySet.java index 2dc801061025888192c3bf2c4c38b928c16a0165..ca788f0dcec4a117b410fe8348969e056b138b1e 100644 --- a/src/main/java/net/minecraft/util/SortedArraySet.java |