From ec8bcfcc2e77d70e1ec8799151e5eb43289e9a63 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 9 Jan 2017 13:39:24 -0600 Subject: [PATCH] Fix block rods consuming the rod --- .../java/vazkii/botania/common/item/rod/ItemDirtRod.java | 7 +++++-- .../vazkii/botania/common/item/rod/ItemSkyDirtRod.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 77049ae59..d5b949cb6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -61,14 +61,17 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev return place(player, world, pos, hand, side, par8, par9, par10, Blocks.DIRT, COST, 0.35F, 0.2F, 0.05F); } - public static EnumActionResult place(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { + public static EnumActionResult place(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ, Block block, int cost, float r, float g, float b) { ItemStack stack = player.getHeldItem(hand); if(ManaItemHandler.requestManaExactForTool(stack, player, cost, false)) { int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); - stackToPlace.onItemUse(player, world, pos, hand, side, par8, par9, par10); + + player.setHeldItem(hand, stackToPlace); + stackToPlace.onItemUse(player, world, pos, hand, side, hitX, hitY, hitZ); + player.setHeldItem(hand, stack); if(stackToPlace.isEmpty()) { ManaItemHandler.requestManaExactForTool(stack, player, cost, true); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 2b1ff1ecb..172d86357 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -52,7 +52,9 @@ public class ItemSkyDirtRod extends ItemDirtRod { if(entities == 0) { ItemStack stackToPlace = new ItemStack(Blocks.DIRT); + player.setHeldItem(hand, stackToPlace); stackToPlace.onItemUse(player, world, new BlockPos(x, y, z), hand, EnumFacing.DOWN, 0F, 0F, 0F); + player.setHeldItem(hand, stack); if(stackToPlace.isEmpty()) { ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, true);