26.2-pre-6

Author: basaigh

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java

@@ -236,8 +236,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 316)
-            .minecraftVersion("26.2 Pre-Release 2")
+            .protocolVersion((1 << 30) | 320)
+            .minecraftVersion("26.2 Pre-Release 6")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/DataComponentTypes.java

@@ -76,7 +76,7 @@ public class DataComponentTypes {
     public static final IntComponentType MAP_ID = register(id -> new IntComponentType(id, "map_id", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
     public static final DataComponentType<NbtMap> MAP_DECORATIONS = register(id -> new DataComponentType<>(id, "map_decorations", MinecraftTypes::readCompoundTag, MinecraftTypes::writeAnyTag, ObjectDataComponent::new));
     public static final IntComponentType MAP_POST_PROCESSING = register(id -> new IntComponentType(id, "map_post_processing", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new));
-    public static final DataComponentType<List<ItemStack>> CHARGED_PROJECTILES = register(id -> new DataComponentType<>(id, "charged_projectiles", listReader(MinecraftTypes::readItemStackTemplate), listWriter(MinecraftTypes::writeItemStackTemplate), ObjectDataComponent::new));
+    public static final DataComponentType<List<ItemStack>> CHARGED_PROJECTILES = register(id -> new DataComponentType<>(id, "charged_projectiles", listReader(MinecraftTypes::readItemStackTemplate, 1024), listWriter(MinecraftTypes::writeItemStackTemplate, 1024), ObjectDataComponent::new));
     public static final DataComponentType<List<ItemStack>> BUNDLE_CONTENTS = register(id -> new DataComponentType<>(id, "bundle_contents", listReader(MinecraftTypes::readItemStackTemplate), listWriter(MinecraftTypes::writeItemStackTemplate), ObjectDataComponent::new));
     public static final DataComponentType<PotionContents> POTION_CONTENTS = register(id -> new DataComponentType<>(id, "potion_contents", ItemTypes::readPotionContents, ItemTypes::writePotionContents, ObjectDataComponent::new));
     public static final DataComponentType<Float> POTION_DURATION_SCALE = register(id -> new DataComponentType<>(id, "potion_duration_scale", ByteBuf::readFloat, ByteBuf::writeFloat, ObjectDataComponent::new));

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java

@@ -24,7 +24,12 @@ public class ClientboundUpdateAttributesPacket implements MinecraftPacket {
     public ClientboundUpdateAttributesPacket(ByteBuf in) {
         this.entityId = MinecraftTypes.readVarInt(in);
         this.attributes = new ArrayList<>();
+
         int length = MinecraftTypes.readVarInt(in);
+        if (length > 128) {
+            throw new IllegalArgumentException(length + " attributes exceeds max size of: " + 128);
+        }
+
         for (int index = 0; index < length; index++) {
             int attributeId = MinecraftTypes.readVarInt(in);
             double value = in.readDouble();
@@ -42,6 +47,11 @@ public ClientboundUpdateAttributesPacket(ByteBuf in) {
     @Override
     public void serialize(ByteBuf out) {
         MinecraftTypes.writeVarInt(out, this.entityId);
+
+        if (this.attributes.size() > 128) {
+            throw new IllegalArgumentException(this.attributes.size() + " attributes exceeds max size of: " + 128);
+        }
+
         MinecraftTypes.writeVarInt(out, this.attributes.size());
         for (Attribute attribute : this.attributes) {
             MinecraftTypes.writeVarInt(out, attribute.getType().getId());

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundDebugSubscriptionRequestPacket.java

@@ -19,14 +19,23 @@ public class ServerboundDebugSubscriptionRequestPacket implements MinecraftPacke
 
     public ServerboundDebugSubscriptionRequestPacket(ByteBuf in) {
         this.subscriptions = new ArrayList<>();
+
         int length = MinecraftTypes.readVarInt(in);
+        if (length > 32) {
+            throw new IllegalArgumentException(length + " subscriptions exceeds max size of: " + 32);
+        }
+
         for (int i = 0; i < length; i++) {
             this.subscriptions.add(DebugSubscriptions.from(MinecraftTypes.readVarInt(in)));
         }
     }
 
     @Override
     public void serialize(ByteBuf out) {
+        if (this.subscriptions.size() > 32) {
+            throw new IllegalArgumentException(this.subscriptions.size() + " subscriptions exceeds max size of: " + 32);
+        }
+
         MinecraftTypes.writeVarInt(out, this.subscriptions.size());
         for (DebugSubscriptions subscription : this.subscriptions) {
             MinecraftTypes.writeVarInt(out, subscription.ordinal());