diff options
Diffstat (limited to 'patches/server/0009-MC-Utils.patch')
| -rw-r--r-- | patches/server/0009-MC-Utils.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 74d7ea2349..8f3da9d5b8 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -5937,7 +5937,7 @@ index 0000000000000000000000000000000000000000..d603887f4d0464f4463172fd79bcd529 + } +} diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 21c2bd6795d044ef6898de57d0734dd453769587..9a12feebbae4a9fdfd24214c2ffa61e717d6e358 100644 +index 3d4c889aa278f814f3af0af62fd38db4f1f05a45..bf17c2005aa71a627c93b3bbaa773a5902b897c1 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -127,7 +127,7 @@ public class Util { @@ -5950,10 +5950,10 @@ index 21c2bd6795d044ef6898de57d0734dd453769587..9a12feebbae4a9fdfd24214c2ffa61e7 public static long getEpochMillis() { diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java -index 4f520046c5b650a780896a565efe959bc0bd21ae..8a8dd896328ec3f392f3c5ef7c94633922e45ee3 100644 +index 557702f85573da753d68fcba76dde7c74de9d12b..1e2f58f2f95c558ce28706c405050c4c5701dd40 100644 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java -@@ -163,7 +163,7 @@ public class CompoundTag implements Tag { +@@ -159,7 +159,7 @@ public class CompoundTag implements Tag { return "TAG_Compound"; } }; @@ -5962,7 +5962,7 @@ index 4f520046c5b650a780896a565efe959bc0bd21ae..8a8dd896328ec3f392f3c5ef7c946339 protected CompoundTag(Map<String, Tag> entries) { this.tags = entries; -@@ -239,6 +239,10 @@ public class CompoundTag implements Tag { +@@ -235,6 +235,10 @@ public class CompoundTag implements Tag { this.tags.put(key, NbtUtils.createUUID(value)); } @@ -6029,7 +6029,7 @@ index 929d31aa624f035eb314dece08969b102f5781fc..e94f0361cbca873f05b5b768c68c0933 + // Paper end - MC Utils - default query payloads } diff --git a/src/main/java/net/minecraft/network/protocol/login/ServerboundCustomQueryAnswerPacket.java b/src/main/java/net/minecraft/network/protocol/login/ServerboundCustomQueryAnswerPacket.java -index 44cac39893eb968aa8ea21ee571c0dcb866ce06c..5151d68ba6ec72a7124f298253c5f0af080b2ea6 100644 +index 3ad2f40a7a1a8878290c5efd3e032572daf0b558..bcc4cd142c22e8d6957a329719353d789b826a69 100644 --- a/src/main/java/net/minecraft/network/protocol/login/ServerboundCustomQueryAnswerPacket.java +++ b/src/main/java/net/minecraft/network/protocol/login/ServerboundCustomQueryAnswerPacket.java @@ -15,7 +15,17 @@ public record ServerboundCustomQueryAnswerPacket(int transactionId, @Nullable Cu @@ -6051,7 +6051,7 @@ index 44cac39893eb968aa8ea21ee571c0dcb866ce06c..5151d68ba6ec72a7124f298253c5f0af } private static CustomQueryAnswerPayload readUnknownPayload(FriendlyByteBuf buf) { -@@ -40,4 +50,21 @@ public record ServerboundCustomQueryAnswerPacket(int transactionId, @Nullable Cu +@@ -38,4 +48,21 @@ public record ServerboundCustomQueryAnswerPacket(int transactionId, @Nullable Cu public void handle(ServerLoginPacketListener listener) { listener.handleCustomQueryPacket(this); } @@ -7364,7 +7364,7 @@ index daa1e9bf39666233dd80eeee0ffd76e168376889..ced67cf88c91c5270a0060a7307f3673 boolean hasChunk(int chunkX, int chunkZ); diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java -index 11364675963d9ef3b69b784ffa4bcd21ec35c530..bc6ea19689a4200a2a0759bed1445ef26c494e9e 100644 +index 497792978bdf0e6a53d772304770e8df3e7416ea..c5454b92ca2565461c799d7340160f9fb72c1b0f 100644 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java +++ b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java @@ -9,6 +9,7 @@ import net.minecraft.core.Holder; @@ -7375,7 +7375,7 @@ index 11364675963d9ef3b69b784ffa4bcd21ec35c530..bc6ea19689a4200a2a0759bed1445ef2 import net.minecraft.world.entity.Entity; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biomes; -@@ -69,7 +70,7 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter { +@@ -67,7 +68,7 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter { private ChunkAccess getChunk(int chunkX, int chunkZ) { int i = chunkX - this.centerX; int j = chunkZ - this.centerZ; @@ -7384,7 +7384,7 @@ index 11364675963d9ef3b69b784ffa4bcd21ec35c530..bc6ea19689a4200a2a0759bed1445ef2 ChunkAccess chunkAccess = this.chunks[i][j]; return (ChunkAccess)(chunkAccess != null ? chunkAccess : new EmptyLevelChunk(this.level, new ChunkPos(chunkX, chunkZ), this.plains.get())); } else { -@@ -77,6 +78,30 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter { +@@ -75,6 +76,30 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter { } } @@ -7713,7 +7713,7 @@ index d59392c322936ce89b759ac9787c8f4f0b228af6..2d6daf76a56574c9727b404feb4f8634 private short tickingFluidCount; public final PalettedContainer<BlockState> states; diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index af83a60623092073881c9d4c0c39d907c31c070c..aee460cd2cfed3134870b5c02bf4ecb5738a5aa0 100644 +index 47d1a5142bdddfa89b1d84002784c1328d8ac3b4..03e5e5c5ea003ba52b9f3ee405cd77e22ea387c8 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -81,6 +81,18 @@ public class ProtoChunk extends ChunkAccess { |