EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 14:46:46 +01:00
Code Issues Projects Releases Wiki Activity

- removed check for BlockData repairData, to fix issue with latest CraftBukkit commit (see issue https://github.com/mcMMO-Dev/mcMMO/issues/3532 )

Browse Source 
- changed material name from OAK_WOOD to OAK_PLANKS
This commit is contained in:
Devon Palma 2018-08-03 15:44:54 -06:00
parent a39a77f89e
commit 986f4cf4c6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java
View File

@ -21,7 +21,7 @@ public enum MaterialType {
return Material.LEATHER; return Material.LEATHER;
case WOOD: case WOOD:
return Material.OAK_WOOD; return Material.OAK_PLANKS;
case STONE: case STONE:
return Material.COBBLESTONE; return Material.COBBLESTONE;

5
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

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