Browse Source

Finished adding skill checks for Emerald Ore and Cocoa.

Glitchfinder 12 years ago
parent
commit
70a16fe344

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java

@@ -193,7 +193,7 @@ public class Herbalism {
             break;
             
         case COCOA:
-            if (data == (byte) 0x2) {
+            if ((((byte) data) & 0x8) == 0x8) {
                 mat = Material.COCOA;
                 xp = Config.getInstance().getHerbalismXPCocoa();
             }

+ 5 - 0
src/main/java/com/gmail/nossr50/util/BlockChecks.java

@@ -52,6 +52,8 @@ public class BlockChecks {
         case VINE:
         case WATER_LILY:
         case YELLOW_FLOWER:
+	case COCOA:
+	case EMERALD_ORE:
             return true;
 
         default:
@@ -123,6 +125,7 @@ public class BlockChecks {
         case IRON_ORE:
         case LAPIS_ORE:
         case REDSTONE_ORE:
+	case EMERALD_ORE:
             return true;
 
         default:
@@ -175,6 +178,7 @@ public class BlockChecks {
         case VINE:
         case WATER_LILY:
         case YELLOW_FLOWER:
+	case COCOA:
             return true;
 
         case CROPS:
@@ -217,6 +221,7 @@ public class BlockChecks {
         case REDSTONE_ORE:
         case SANDSTONE:
         case STONE:
+	case EMERALD_ORE:
             return true;
 
         default: