Fix #118

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomContainerMenu.java

@@ -251,7 +251,12 @@ public void sendChangesToRemote(int pingId) {
 
         var offHand = serverPlayer.getOffhandItem();
         if (!remoteOffHand.matches(offHand)) {
-            packets.add(new ClientboundContainerSetSlotPacket(serverPlayer.inventoryMenu.containerId, incrementStateId(), OFF_HAND_SLOT, offHand.copy()));
+            packets.add(new ClientboundContainerSetSlotPacket(
+                serverPlayer.inventoryMenu.containerId,
+                serverPlayer.inventoryMenu.incrementStateId(),
+                OFF_HAND_SLOT,
+                serverPlayer.getOffhandItem()
+            ));
             remoteOffHand.force(offHand);
         }
 
@@ -274,15 +279,6 @@ public void sendChangesToRemote(int pingId) {
         PacketListener.getInstance().injectOutgoing(player, packets);
     }
 
-    /**
-     * Sends the cursor item stack to the remote client.
-     */
-    public void sendCarriedToRemote() {
-        var content = new ClientboundSetCursorItemPacket(carried.copy());
-        PacketListener.getInstance().injectOutgoing(player, content);
-        remoteCarried.force(carried);
-    }
-    
     /**
      * Sends all data to the remote client.
      *
@@ -321,9 +317,22 @@ private List<Packet<? super ClientGamePacketListener>> createContainerInitPacket
             Arrays.stream(items).map(ItemStack::copy).toList(),
             carried.copy()
         ));
+        
+        // cursor
+        packets.add(new ClientboundSetCursorItemPacket(carried.copy()));
+        
+        // off-hand
+        packets.add(new ClientboundContainerSetSlotPacket(
+            serverPlayer.inventoryMenu.containerId,
+            serverPlayer.inventoryMenu.incrementStateId(),
+            OFF_HAND_SLOT,
+            serverPlayer.getOffhandItem()
+        ));
+        
         for (int i = 0; i < dataSlots.length; i++) {
             packets.add(new ClientboundContainerSetDataPacket(containerId, i, dataSlots[i]));
         }
+        
         if (pingId >= 0) {
             packets.add(createMaskedPingPacket(pingId));
         }