EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #278 from Glitchfinder/master

Browse Source 
Basic update for 1.4.2
This commit is contained in:
Grant
2012-10-29 10:25:29 -07:00
parent efc0edf3ef db0168205d
commit fa96a6beec
5 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,6 +201,20 @@ public class Herbalism {
}
break;
case CARROT:
if (((byte) data) == 0x3) {
mat = Material.CARROT;
xp = Config.getInstance().getHerbalismXPCarrot();
}
break;
case POTATO:
if (((byte) data) == 0x3) {
mat = Material.POTATO;
xp = Config.getInstance().getHerbalismXPPotato();
}
break;
default:
if (Config.getInstance().getBlockModsEnabled() && CustomBlocksConfig.getInstance().customHerbalismBlocks.contains(new ItemStack(block.getTypeId(), 1, (short) 0, block.getData()))) {
customPlant = true;
@ -223,6 +237,13 @@ public class Herbalism {
if (mat == Material.COCOA) {
is = new ItemStack(Material.INK_SACK, 1, (short) 3);
}
else if (mat == Material.COCOA) {
is = new ItemStack(Material.CARROT_ITEM, 1, (short) 0);
}
else if (mat == Material.COCOA) {
is = new ItemStack(Material.POTATO_ITEM, 1, (short) 0);
}
else {
is = new ItemStack(mat);
}
@ -306,6 +327,18 @@ public class Herbalism {
}
break;
case CARROT:
if (configInstance.getCarrotDoubleDropsEnabled()) {
Misc.dropItem(location, is);
}
break;
case POTATO:
if (configInstance.getPotatoDoubleDropsEnabled()) {
Misc.dropItem(location, is);
}
break;
default:
if (customPlant) {
CustomBlock customBlock = ModChecks.getCustomBlock(block);