aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/forestry/bees
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry/bees')
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index d27f478169..64b744aaf8 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -155,8 +155,8 @@ public class GTPP_Bees {
}
private Materials trySetValue(String material) {
- Materials mTemp = Materials.valueOf(material);
- if (mTemp != null) {
+ Materials mTemp = Materials.get(material);
+ if (mTemp != Materials._NULL) {
return mTemp;
}
return Materials._NULL;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
index 70856235dd..e5d36d15e8 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -78,7 +78,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame {
}
@Override
- public boolean hasEffect(final ItemStack par1ItemStack) {
+ public boolean hasEffect(final ItemStack par1ItemStack, final int pass) {
if ((this.rarity_value == EnumRarity.uncommon) || (this.rarity_value == EnumRarity.common)) {
return false;
}