Fixed result item with Use Item feature

GirafiStudios · Aug 7, 2019 · f1b5243 · f1b5243
1 parent b0e01e4
commit f1b5243
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/dmillerw/menu/network/packet/server/PacketUseItem.java b/src/main/java/dmillerw/menu/network/packet/server/PacketUseItem.java
@@ -4,6 +4,8 @@
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Hand;
 import net.minecraftforge.fml.network.NetworkEvent;
 
@@ -29,16 +31,17 @@ public static void handle(PacketUseItem message, Supplier<NetworkEvent.Context>
             ServerPlayerEntity player = ctx.get().getSender();
             if (player != null) {
                 ItemStack slotStack = player.inventory.getStackInSlot(message.slot);
-                ItemStack held = player.getHeldItemMainhand();
+                ItemStack heldSaved = player.getHeldItemMainhand();
                 Hand hand = Hand.MAIN_HAND;
                 EquipmentSlotType slot = getSlotFromHand(hand);
 
                 player.setItemStackToSlot(slot, slotStack);
                 ItemStack heldItem = player.getHeldItem(hand);
-                if (!heldItem.isEmpty()) {
-                    heldItem.useItemRightClick(player.world, player, hand).getResult();
+                ActionResult<ItemStack> useStack = heldItem.useItemRightClick(player.world, player, hand);
+                if (useStack.getType() == ActionResultType.SUCCESS) {
+                    player.inventory.mainInventory.set(message.slot, useStack.getResult());
                 }
-                player.setItemStackToSlot(slot, held);
+                player.setItemStackToSlot(slot, heldSaved);
 
                 player.sendContainerToPlayer(player.container);