From 8161383aebd87b4789ac325ea23c9ccf43c19bc3 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 7 Jun 2014 08:47:46 +0800 Subject: [PATCH] #730 Stack Overflow with ds axe and ds pick next to each other in hot bar when right click. --- .../crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 2c10e432..2089e72b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -201,7 +201,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I @Override public boolean onItemUse(ItemStack item, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { int slot = player.inventory.currentItem + 1; - if(slot < 9 && player.inventory.mainInventory[slot] != null) { + if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, par3World, par4, par5, par6, par7, par8, par9, par10); }