OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild patches with record field access fix

Browse source
This commit is contained in:
Jason Penilla 2021-11-26 19:53:13 -08:00 committed by MiniDigger | Martin
parent 251b568882
commit 231e0cd3b5
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
patches/server/0005-MC-Dev-fixes.patch
View file

@ -306,7 +306,7 @@ index 0f7950458dc2dfac51ed0d56f1790395f0b03bc2..fa4544541b9c5f163b633596e73a5197
@Nullable @Nullable
private Biome.Precipitation precipitation; 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 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 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
+++ b/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<T> implements PaletteResize<T> { @@ -278,10 +278,6 @@ public class PalettedContainer<T> implements PaletteResize<T> {
@ -320,17 +320,7 @@ index e76a49b11e4617fee249d884f5ec2cbca0141def..71fbb476ad081424cc8807c01818f332
public PalettedContainer.Data<T> createData(IdMap<T> idList, PaletteResize<T> listener, int size) { public PalettedContainer.Data<T> createData(IdMap<T> idList, PaletteResize<T> listener, int size) {
BitStorage bitStorage = (BitStorage)(this.bits == 0 ? new ZeroBitStorage(size) : new SimpleBitStorage(this.bits, size)); BitStorage bitStorage = (BitStorage)(this.bits == 0 ? new ZeroBitStorage(size) : new SimpleBitStorage(this.bits, size));
@@ -296,9 +292,6 @@ public class PalettedContainer<T> implements PaletteResize<T> { @@ -316,10 +312,6 @@ public class PalettedContainer<T> implements PaletteResize<T> {
}
static record Data<T>(PalettedContainer.Configuration<T> configuration, BitStorage storage, Palette<T> palette) {
- final BitStorage storage;
- final Palette<T> palette;
-
public void copyFrom(Palette<T> 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<T> implements PaletteResize<T> {
} }
static record DiscData<T>(List<T> paletteEntries, Optional<LongStream> storage) { static record DiscData<T>(List<T> paletteEntries, Optional<LongStream> storage) {