EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-16 04:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Updates to metadata, change to use block.getRelative in Woodcutting.java

Browse Source
This commit is contained in:
GJ
2012-03-15 00:52:37 -04:00
parent 058cc3aac9
commit bb5d003430
9 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ public class Herbalism {
Block b = block.getRelative(0, y, 0);
if (b.getType().equals(Material.CACTUS)) {
mat = Material.CACTUS;
if (!b.hasMetadata("placedBlock")) {
if (!b.hasMetadata("mcmmoPlacedBlock")) {
if(herbLevel > MAX_BONUS_LEVEL || (Math.random() * 1000 <= herbLevel)) {
catciDrops++;
}
@ -154,7 +154,7 @@ public class Herbalism {
break;
case MELON_BLOCK:
if (!block.hasMetadata("placedBlock")) {
if (!block.hasMetadata("mcmmoPlacedBlock")) {
mat = Material.MELON;
xp = LoadProperties.mmelon;
}
@ -169,7 +169,7 @@ public class Herbalism {
case PUMPKIN:
case JACK_O_LANTERN:
if (!block.hasMetadata("placedBlock")) {
if (!block.hasMetadata("mcmmoPlacedBlock")) {
mat = Material.getMaterial(id);
xp = LoadProperties.mpumpkin;
}
@ -177,7 +177,7 @@ public class Herbalism {
case RED_ROSE:
case YELLOW_FLOWER:
if (!block.hasMetadata("placedBlock")) {
if (!block.hasMetadata("mcmmoPlacedBlock")) {
mat = Material.getMaterial(id);
xp = LoadProperties.mflower;
}
@ -188,7 +188,7 @@ public class Herbalism {
Block b = block.getRelative(0, y, 0);
if (b.getType().equals(Material.SUGAR_CANE_BLOCK)) {
mat = Material.SUGAR_CANE;
if (!b.hasMetadata("placedBlock")) {
if (!b.hasMetadata("mcmmoPlacedBlock")) {
if(herbLevel > MAX_BONUS_LEVEL || (Math.random() * 1000 <= herbLevel)) {
caneDrops++;
}
@ -199,14 +199,14 @@ public class Herbalism {
break;
case VINE:
if (!block.hasMetadata("placedBlock")) {
if (!block.hasMetadata("mcmmoPlacedBlock")) {
mat = type;
xp = LoadProperties.mvines;
}
break;
case WATER_LILY:
if (!block.hasMetadata("placedBlock")) {
if (!block.hasMetadata("mcmmoPlacedBlock")) {
mat = type;
xp = LoadProperties.mlilypad;
}