From 82f2dab8c12300e949a788cc625199966fddf5c2 Mon Sep 17 00:00:00 2001 From: hilburn Date: Wed, 18 Feb 2015 19:54:20 +0000 Subject: [PATCH] Harvest Level returns 0 for deactivated tools --- .../alchemicalWizardry/common/items/BoundAxe.java | 8 ++++---- .../alchemicalWizardry/common/items/BoundPickaxe.java | 8 ++++---- .../alchemicalWizardry/common/items/BoundShovel.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 746a1660..4444c00c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -227,13 +227,13 @@ public class BoundAxe extends ItemAxe implements IBindable public boolean getActivated(ItemStack par1ItemStack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) + if (!par1ItemStack.hasTagCompound()) { par1ItemStack.setTagCompound(new NBTTagCompound()); } + NBTTagCompound itemTag = par1ItemStack.getTagCompound(); + return itemTag.getBoolean("isActive"); } @@ -321,7 +321,7 @@ public class BoundAxe extends ItemAxe implements IBindable @Override public int getHarvestLevel(ItemStack stack, String toolClass) { - if ("axe".equals(toolClass)) + if (getActivated(stack) && "axe".equals(toolClass)) { return 5; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index f05493ef..9b7c7f93 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -235,13 +235,13 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable public boolean getActivated(ItemStack par1ItemStack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) + if (!par1ItemStack.hasTagCompound()) { par1ItemStack.setTagCompound(new NBTTagCompound()); } + NBTTagCompound itemTag = par1ItemStack.getTagCompound(); + return itemTag.getBoolean("isActive"); } @@ -331,7 +331,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable @Override public int getHarvestLevel(ItemStack stack, String toolClass) { - if ("pickaxe".equals(toolClass)) + if (getActivated(stack) && "pickaxe".equals(toolClass)) { return 5; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index e08994ba..82969790 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -233,13 +233,13 @@ public class BoundShovel extends ItemSpade implements IBindable public boolean getActivated(ItemStack par1ItemStack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) + if (!par1ItemStack.hasTagCompound()) { par1ItemStack.setTagCompound(new NBTTagCompound()); } + NBTTagCompound itemTag = par1ItemStack.getTagCompound(); + return itemTag.getBoolean("isActive"); } @@ -330,7 +330,7 @@ public class BoundShovel extends ItemSpade implements IBindable @Override public int getHarvestLevel(ItemStack stack, String toolClass) { - if ("shovel".equals(toolClass)) + if (getActivated(stack) && "shovel".equals(toolClass)) { return 5; }