From 231e0cd3b53e0fcf5904eaf9f161287ee655aa36 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Fri, 26 Nov 2021 19:53:13 -0800 Subject: [PATCH] Rebuild patches with record field access fix --- patches/server/0005-MC-Dev-fixes.patch | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch index 7b8ae45ba8..0a6b3d81de 100644 --- a/patches/server/0005-MC-Dev-fixes.patch +++ b/patches/server/0005-MC-Dev-fixes.patch @@ -306,7 +306,7 @@ index 0f7950458dc2dfac51ed0d56f1790395f0b03bc2..fa4544541b9c5f163b633596e73a5197 @Nullable private Biome.Precipitation precipitation; diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index e76a49b11e4617fee249d884f5ec2cbca0141def..71fbb476ad081424cc8807c01818f332887ae366 100644 +index 86b326be30b4d1569878bad01665f465ba2c7ef6..71fbb476ad081424cc8807c01818f332887ae366 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -278,10 +278,6 @@ public class PalettedContainer implements PaletteResize { @@ -320,17 +320,7 @@ index e76a49b11e4617fee249d884f5ec2cbca0141def..71fbb476ad081424cc8807c01818f332 public PalettedContainer.Data createData(IdMap idList, PaletteResize listener, int size) { BitStorage bitStorage = (BitStorage)(this.bits == 0 ? new ZeroBitStorage(size) : new SimpleBitStorage(this.bits, size)); -@@ -296,9 +292,6 @@ public class PalettedContainer implements PaletteResize { - } - - static record Data(PalettedContainer.Configuration configuration, BitStorage storage, Palette palette) { -- final BitStorage storage; -- final Palette palette; -- - public void copyFrom(Palette palette, BitStorage storage) { - for(int i = 0; i < storage.getSize(); ++i) { - T object = palette.valueFor(storage.get(i)); -@@ -319,10 +312,6 @@ public class PalettedContainer implements PaletteResize { +@@ -316,10 +312,6 @@ public class PalettedContainer implements PaletteResize { } static record DiscData(List paletteEntries, Optional storage) {