From a0f66373b6f52a236d5915e9b472c602de985a56 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 20 Jul 2016 22:31:27 +0200 Subject: [PATCH] Fixed bowls of water being hideous because they weren't going into the main hand --- .../ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java index ec63fce58..3a2bec574 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java @@ -42,6 +42,7 @@ public class ItemWaterBowl extends ItemBase{ @SubscribeEvent public void onPlayerInteractEvent(PlayerInteractEvent event){ + System.out.println("ACTIVE"); if(event.getWorld() != null){ if(ConfigBoolValues.WATER_BOWL.isEnabled()){ if(event.getItemStack() != null && event.getItemStack().getItem() == Items.BOWL){ @@ -60,7 +61,10 @@ public class ItemWaterBowl extends ItemBase{ event.getItemStack().stackSize--; ItemStack bowl = new ItemStack(InitItems.itemWaterBowl); - if(!event.getEntityPlayer().inventory.addItemStackToInventory(bowl.copy())){ + if(event.getItemStack().stackSize <= 0){ + event.getEntityPlayer().setHeldItem(event.getHand(), bowl); + } + else if(!event.getEntityPlayer().inventory.addItemStackToInventory(bowl.copy())){ EntityItem entityItem = new EntityItem(event.getWorld(), event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, bowl.copy()); entityItem.setPickupDelay(0); event.getWorld().spawnEntityInWorld(entityItem);