Add null check for DynamicID too

CloudburstMC · Sep 16, 2024 · a1c841c · a1c841c
1 parent b315ef6
commit a1c841c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../cloudburstmc/protocol/bedrock/codec/v712/serializer/InventoryContentSerializer_v712.java b/.../cloudburstmc/protocol/bedrock/codec/v712/serializer/InventoryContentSerializer_v712.java
@@ -14,7 +14,7 @@ public class InventoryContentSerializer_v712 extends InventoryContentSerializer_
     @Override
     public void serialize(ByteBuf buffer, BedrockCodecHelper helper, InventoryContentPacket packet) {
         super.serialize(buffer, helper, packet);
-        VarInts.writeUnsignedInt(buffer, packet.getContainerNameData() == null ? 0 : packet.getContainerNameData().getDynamicId());
+        VarInts.writeUnsignedInt(buffer, packet.getContainerNameData() == null || packet.getContainerNameData().getDynamicId() == null ? 0 : packet.getContainerNameData().getDynamicId());
     }
 
     @Override

diff --git a/...org/cloudburstmc/protocol/bedrock/codec/v712/serializer/InventorySlotSerializer_v712.java b/...org/cloudburstmc/protocol/bedrock/codec/v712/serializer/InventorySlotSerializer_v712.java
@@ -15,7 +15,7 @@ public class InventorySlotSerializer_v712 implements BedrockPacketSerializer<Inv
     public void serialize(ByteBuf buffer, BedrockCodecHelper helper, InventorySlotPacket packet) {
         VarInts.writeUnsignedInt(buffer, packet.getContainerId());
         VarInts.writeUnsignedInt(buffer, packet.getSlot());
-        VarInts.writeUnsignedInt(buffer, packet.getContainerNameData() == null ? 0 : packet.getContainerNameData().getDynamicId());
+        VarInts.writeUnsignedInt(buffer, packet.getContainerNameData() == null || packet.getContainerNameData().getDynamicId() == null ? 0 : packet.getContainerNameData().getDynamicId());
         helper.writeNetItem(buffer, packet.getItem());
     }