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

TreeFeller.dropBlocks cleanup

Browse Source
This commit is contained in:
bm01 2013-02-16 21:31:06 +01:00
parent 91010f2958
commit 3cb269de4b
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java
View File

@ -177,7 +177,8 @@ public final class TreeFeller {
switch (block.getType()) { switch (block.getType()) {
case HUGE_MUSHROOM_1: case HUGE_MUSHROOM_1:
case HUGE_MUSHROOM_2: case HUGE_MUSHROOM_2:
Woodcutting.checkForDoubleDrop(mcMMOPlayer, block); // TODO: checkForDoubleDrop doesn't handle mushrooms, what's intended? Double drop or not?
// Woodcutting.checkForDoubleDrop(mcMMOPlayer, block);
try { try {
xp += Woodcutting.getExperienceFromLog(block, ExperienceGainMethod.TREE_FELLER); xp += Woodcutting.getExperienceFromLog(block, ExperienceGainMethod.TREE_FELLER);
@ -186,23 +187,13 @@ public final class TreeFeller {
break; break;
} }
//Stems have a block data value of 15 and should not drop mushrooms // Stems have a block data value of 15 and should not drop mushrooms
//0-2 mushrooms drop when you break a block // 0-2 mushrooms drop when you break a block
if(block.getData() != (byte) 15) { if (block.getData() == (byte) 15) {
switch(block.getType()) {
case HUGE_MUSHROOM_1:
Misc.randomDropItem(block.getLocation(), new ItemStack(Material.BROWN_MUSHROOM, 1), 50);
Misc.randomDropItem(block.getLocation(), new ItemStack(Material.BROWN_MUSHROOM, 1), 50);
break; break;
case HUGE_MUSHROOM_2:
Misc.randomDropItem(block.getLocation(), new ItemStack(Material.RED_MUSHROOM, 1), 50);
Misc.randomDropItem(block.getLocation(), new ItemStack(Material.RED_MUSHROOM, 1), 50);
break;
default:
break;
}
} }
Misc.randomDropItems(block.getLocation(), new ItemStack(block.getType(), 1), 50, 2);
break; break;
case LOG: case LOG:
Woodcutting.checkForDoubleDrop(mcMMOPlayer, block); Woodcutting.checkForDoubleDrop(mcMMOPlayer, block);