Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 11:07:44 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the Cacti & Sugar Cane fix!

Browse Source
This commit is contained in:
bm01 2013-03-08 19:33:03 +01:00
parent d9bd0ace9a
commit 0e2746622d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ public class Herbalism {
protected static int calculateCatciAndSugarDrops(BlockState blockState) { protected static int calculateCatciAndSugarDrops(BlockState blockState) {
Block block = blockState.getBlock(); Block block = blockState.getBlock();
Material blockType = blockState.getType(); Material blockType = blockState.getType();
int dropAmount = 1; int dropAmount = mcMMO.placeStore.isTrue(block) ? 0 : 1;
// Handle the two blocks above it - cacti & sugar cane can only grow 3 high naturally // Handle the two blocks above it - cacti & sugar cane can only grow 3 high naturally
for (int y = 1; y < 3; y++) { for (int y = 1; y < 3; y++) {
@ -73,7 +73,10 @@ public class Herbalism {
break; break;
} }
if (!mcMMO.placeStore.isTrue(relativeBlock)) { if (mcMMO.placeStore.isTrue(relativeBlock)) {
mcMMO.placeStore.setFalse(relativeBlock);
}
else {
dropAmount++; dropAmount++;
} }
} }

5
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -114,8 +114,9 @@ public class HerbalismManager extends SkillManager {
*/ */
public void herbalismBlockCheck(BlockState blockState) { public void herbalismBlockCheck(BlockState blockState) {
Material material = blockState.getType(); Material material = blockState.getType();
boolean oneBlockPlant = (material == Material.CACTUS || material == Material.SUGAR_CANE_BLOCK) ? false : true;
if (mcMMO.placeStore.isTrue(blockState) && (material != Material.CACTUS || material != Material.SUGAR_CANE_BLOCK)) { if (oneBlockPlant && mcMMO.placeStore.isTrue(blockState)) {
return; return;
} }
@ -136,7 +137,7 @@ public class HerbalismManager extends SkillManager {
drop = herbalismBlock.getDropItem(); drop = herbalismBlock.getDropItem();
} }
if (material == Material.CACTUS || material == Material.SUGAR_CANE_BLOCK) { if (!oneBlockPlant) {
amount = Herbalism.calculateCatciAndSugarDrops(blockState); amount = Herbalism.calculateCatciAndSugarDrops(blockState);
xp *= amount; xp *= amount;
} }