diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index fa81611..ddfee0b 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -211,20 +211,23 @@ public class MineTweakerImplementationAPI { } } else if (arguments[0].equals("hand") && player != null) { IItemStack item = player.getCurrentItem(); + if (item != null) { + List recipes = MineTweakerAPI.recipes.getRecipesFor(item.anyAmount()); + if (recipes.isEmpty()) { + player.sendChat("No crafting recipes found for that item"); + } else { + StringBuilder recipesString = new StringBuilder(); - List recipes = MineTweakerAPI.recipes.getRecipesFor(item.anyAmount()); - if (recipes.isEmpty()) { - player.sendChat("No crafting recipes found for that item"); - } else { - StringBuilder recipesString = new StringBuilder(); + for (ICraftingRecipe recipe : recipes) { + MineTweakerAPI.logCommand(recipe.toCommandString()); + player.sendChat(recipe.toCommandString()); + recipesString.append(recipe.toCommandString()).append("\n"); + } - for (ICraftingRecipe recipe : recipes) { - MineTweakerAPI.logCommand(recipe.toCommandString()); - player.sendChat(recipe.toCommandString()); - recipesString.append(recipe.toCommandString()).append("\n"); + copyToClipboard(recipesString.toString()); } - - copyToClipboard(recipesString.toString()); + } else { + player.sendChat("No item was found"); } } else { if (player != null) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java index 7e143f4..575b209 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -272,7 +272,7 @@ public class MCItemStack implements IItemStack { @Override public boolean matches(IItemStack item) { ItemStack internal = getItemStack(item); - return internal.getItem() == stack.getItem() && (wildcardSize || internal.stackSize >= stack.stackSize) && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == internal.getItemDamage() || (!stack.getHasSubtypes() && !stack.getItem().isDamageable())); + return internal !=null && stack !=null &&internal.getItem() == stack.getItem() && (wildcardSize || internal.stackSize >= stack.stackSize) && (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == internal.getItemDamage() || (!stack.getHasSubtypes() && !stack.getItem().isDamageable())); } @Override