Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-30 20:48:19 +01:00
Code Issues Projects Releases Wiki Activity

Fixing spacing issues and making herbalism drop cocoa beans instead of a cocoa block.

Browse Source
This commit is contained in:
Glitchfinder 2012-10-17 21:26:16 -07:00
parent 70a16fe344
commit 31513d52d7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
View File

@ -218,7 +218,12 @@ public class Herbalism {
is = new ItemStack(ModChecks.getCustomBlock(block).getItemDrop()); is = new ItemStack(ModChecks.getCustomBlock(block).getItemDrop());
} }
else { else {
is = new ItemStack(mat); if (mat == Material.COCOA) {
is = new ItemStack(Material.INK_SACK, 1, (short) 3);
}
else {
is = new ItemStack(mat);
}
} }
if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel) { if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(randomChance) <= herbLevel) {

10
src/main/java/com/gmail/nossr50/util/BlockChecks.java
View File

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