Merge pull request #3641 from Matyrobbrt/develop

Fix stacks having superfluous NBT and fluids in the pattern grid
refinedmods · Mar 5, 2024 · cae8f65 · cae8f65
2 parents f5f98bb + dc277e2
commit cae8f65
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Fixed
+- Fixed items in disks deserializing with an empty NBT tag.
+- Fixed placing fluids in the pattern grid disconnecting the client.
+
 ## [1.13.0-beta.2] - 2024-02-16
 
 ### Fixed

diff --git a/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java b/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java
@@ -55,7 +55,7 @@ public void register(IPayloadRegistrar registrar) {
         registrar.play(
             FluidFilterSlotUpdateMessage.ID,
             FluidFilterSlotUpdateMessage::decode,
-            handler -> handler.server(FluidFilterSlotUpdateMessage::handle)
+            handler -> handler.client(FluidFilterSlotUpdateMessage::handle)
         );
         registrar.play(
             BlockEntitySynchronizationParameterMessage.ID,

diff --git a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java
@@ -338,7 +338,7 @@ public static ItemStack deserializeStackFromNbt(CompoundTag tag) {
         return AttachmentInternals.reconstructItemStack(
             BuiltInRegistries.ITEM.get(new ResourceLocation(tag.getString(NBT_ITEM_ID))),
             tag.getInt(NBT_ITEM_QUANTITY),
-            tag.getCompound(NBT_ITEM_NBT)
+            tag.contains(NBT_ITEM_NBT) ? tag.getCompound(NBT_ITEM_NBT) : null
         );
     }
 }