Browse Source

TreeFeller.dropBlocks cleanup

bm01 12 years ago
parent
commit
3cb269de4b
1 changed files with 13 additions and 22 deletions
  1. 13 22
      src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java

+ 13 - 22
src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java

@@ -177,33 +177,24 @@ 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);
-            	
-            	try {
+                // TODO: checkForDoubleDrop doesn't handle mushrooms, what's intended? Double drop or not?
+                // Woodcutting.checkForDoubleDrop(mcMMOPlayer, block);
+
+                try {
                     xp += Woodcutting.getExperienceFromLog(block, ExperienceGainMethod.TREE_FELLER);
                     xp += Woodcutting.getExperienceFromLog(block, ExperienceGainMethod.TREE_FELLER);
                 }
                 }
                 catch (IllegalArgumentException exception) {
                 catch (IllegalArgumentException exception) {
                     break;
                     break;
                 }
                 }
-            	
-            	//Stems have a block data value of 15 and should not drop mushrooms
-            	//0-2 mushrooms drop when you break a block
-            	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;
-            		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;
-            		}
-            	}
-            	
-            	break;
+
+                // Stems have a block data value of 15 and should not drop mushrooms
+                // 0-2 mushrooms drop when you break a block
+                if (block.getData() == (byte) 15) {
+                    break;
+                }
+
+                Misc.randomDropItems(block.getLocation(), new ItemStack(block.getType(), 1), 50, 2);
+                break;
             case LOG:
             case LOG:
                 Woodcutting.checkForDoubleDrop(mcMMOPlayer, block);
                 Woodcutting.checkForDoubleDrop(mcMMOPlayer, block);