Procházet zdrojové kódy

Updated SkillUtils to no longer use BlockData (#3533)

Aaron Karras před 7 roky
rodič
revize
fa1bbd2031

+ 2 - 3
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -278,7 +278,6 @@ public class SkillUtils {
         item.setDurability((short) 0);
 
         int quantity = 0;
-        BlockData repairData = repairMaterial != null ? repairMaterial.createBlockData() : null;
         List<Recipe> recipes = mcMMO.p.getServer().getRecipesFor(item);
 
         if (recipes.isEmpty()) {
@@ -289,14 +288,14 @@ public class SkillUtils {
 
         if (recipe instanceof ShapelessRecipe) {
             for (ItemStack ingredient : ((ShapelessRecipe) recipe).getIngredientList()) {
-                if (ingredient != null && (repairMaterial == null || ingredient.getType() == repairMaterial) && (repairMetadata == -1 || ingredient.getType().equals(repairData))) {
+                if (ingredient != null && (repairMaterial == null || ingredient.getType() == repairMaterial) && (repairMetadata == -1 || ingredient.getType().equals(repairMaterial))) {
                     quantity += ingredient.getAmount();
                 }
             }
         }
         else if (recipe instanceof ShapedRecipe) {
             for (ItemStack ingredient : ((ShapedRecipe) recipe).getIngredientMap().values()) {
-                if (ingredient != null && (repairMaterial == null || ingredient.getType() == repairMaterial) && (repairMetadata == -1 || ingredient.getType().equals(repairData))) {
+                if (ingredient != null && (repairMaterial == null || ingredient.getType() == repairMaterial) && (repairMetadata == -1 || ingredient.getType().equals(repairMaterial))) {
                     quantity += ingredient.getAmount();
                 }
             }