diff --git a/patches/server/0041-Add-more-fallback-code-for-chunk-bans.patch b/patches/server/0041-Add-more-fallback-code-for-chunk-bans.patch index dec2e44..7f7c432 100644 --- a/patches/server/0041-Add-more-fallback-code-for-chunk-bans.patch +++ b/patches/server/0041-Add-more-fallback-code-for-chunk-bans.patch @@ -5,28 +5,19 @@ Subject: [PATCH] Add more fallback code for chunk bans diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -index 5d3e739d28d394ed59fe0003245cc55ac62e6087..7189525e573be6d5023c6b34fded8bd1259293f9 100644 +index 5d3e739d28d394ed59fe0003245cc55ac62e6087..e721aa95e0e11455df2fb337978cefdd1bbcf018 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -@@ -1,11 +1,17 @@ +@@ -1,6 +1,8 @@ package net.minecraft.network.protocol.game; import java.util.function.BiFunction; -+import java.util.stream.Collectors; + +import me.totalfreedom.scissors.NbtUtility; -+import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.Registries; - import net.minecraft.nbt.CompoundTag; - import net.minecraft.network.RegistryFriendlyByteBuf; -+import net.minecraft.network.chat.Component; -+import net.minecraft.network.chat.SignedMessageBody; - import net.minecraft.network.codec.ByteBufCodecs; - import net.minecraft.network.codec.StreamCodec; - import net.minecraft.network.protocol.Packet; -@@ -36,6 +42,23 @@ public class ClientboundBlockEntityDataPacket implements Packet type() { return GamePacketTypes.CLIENTBOUND_MAP_ITEM_DATA; -@@ -46,6 +59,8 @@ public record ClientboundMapItemDataPacket( - listener.handleMapItemData(this); - } - -+ -+ - public void applyToMap(MapItemSavedData mapState) { - this.decorations.ifPresent(mapState::addClientSideDecorations); - this.colorPatch.ifPresent(updateData -> updateData.applyToMap(mapState)); diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java -index 37ab438ab37b9235666ae69376509bdde7722d87..cd1d0efec72c83e0f2bbc7ffcb5d2d3b8385f4fe 100644 +index 37ab438ab37b9235666ae69376509bdde7722d87..b6cdadfbfe8756a3fd10b7a2d93da31701bc44e1 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java -@@ -1,7 +1,10 @@ - package net.minecraft.network.protocol.game; +@@ -2,6 +2,8 @@ package net.minecraft.network.protocol.game; -+import java.util.Optional; import java.util.UUID; import javax.annotation.Nullable; + @@ -122,7 +102,7 @@ index 37ab438ab37b9235666ae69376509bdde7722d87..cd1d0efec72c83e0f2bbc7ffcb5d2d3b import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.ChatType; -@@ -39,6 +42,19 @@ public record ClientboundPlayerChatPacket( +@@ -39,6 +41,19 @@ public record ClientboundPlayerChatPacket( ); }