EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-01-19 00:45:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix ClassCastException with trying to use Woodcutting on Mushrooms.

Browse Source
This commit is contained in:
GJ 2013-02-23 15:03:39 -05:00
parent 8d16c06739
commit 301914d94b
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,22 +177,14 @@ public final class TreeFeller {
Material material = blockState.getType(); Material material = blockState.getType();
switch (material) { if (material == Material.HUGE_MUSHROOM_1 || material == Material.HUGE_MUSHROOM_2) {
case HUGE_MUSHROOM_1:
case HUGE_MUSHROOM_2:
xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER); xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
for (ItemStack drop : blockState.getBlock().getDrops()) { for (ItemStack drop : blockState.getBlock().getDrops()) {
Misc.dropItem(blockState.getLocation(), drop); Misc.dropItem(blockState.getLocation(), drop);
} }
break;
default:
break;
} }
else if (ModChecks.isCustomLogBlock(blockState)) {
if (ModChecks.isCustomLogBlock(blockState)) {
Woodcutting.checkForDoubleDrop(player, blockState); Woodcutting.checkForDoubleDrop(player, blockState);
CustomBlock customBlock = ModChecks.getCustomBlock(blockState); CustomBlock customBlock = ModChecks.getCustomBlock(blockState);
@ -211,21 +203,22 @@ public final class TreeFeller {
else if (ModChecks.isCustomLeafBlock(blockState)) { else if (ModChecks.isCustomLeafBlock(blockState)) {
Misc.randomDropItem(blockState.getLocation(), ModChecks.getCustomBlock(blockState).getItemDrop(), 10); Misc.randomDropItem(blockState.getLocation(), ModChecks.getCustomBlock(blockState).getItemDrop(), 10);
} }
else {
Tree tree = (Tree) blockState.getData();
switch (material) {
case LOG:
Woodcutting.checkForDoubleDrop(player, blockState);
xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
Misc.dropItem(blockState.getLocation(), new ItemStack(Material.LOG, 1, tree.getSpecies().getData()));
break;
Tree tree = (Tree) blockState.getData(); case LEAVES:
switch (material) { Misc.randomDropItem(blockState.getLocation(), new ItemStack(Material.SAPLING, 1, tree.getSpecies().getData()), 10);
case LOG: break;
Woodcutting.checkForDoubleDrop(player, blockState);
xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
Misc.dropItem(blockState.getLocation(), new ItemStack(Material.LOG, 1, tree.getSpecies().getData()));
break;
case LEAVES: default:
Misc.randomDropItem(blockState.getLocation(), new ItemStack(Material.SAPLING, 1, tree.getSpecies().getData()), 10); break;
break; }
default:
break;
} }
blockState.setRawData((byte) 0x0); blockState.setRawData((byte) 0x0);

7
src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
View File

@ -1,6 +1,7 @@
package com.gmail.nossr50.skills.woodcutting; package com.gmail.nossr50.skills.woodcutting;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -61,7 +62,11 @@ public final class Woodcutting {
int xp = getExperienceFromLog(blockState, ExperienceGainMethod.DEFAULT); int xp = getExperienceFromLog(blockState, ExperienceGainMethod.DEFAULT);
if (Permissions.doubleDrops(player, SkillType.WOODCUTTING)) { if (Permissions.doubleDrops(player, SkillType.WOODCUTTING)) {
checkForDoubleDrop(player, blockState); Material blockType = blockState.getType();
if (blockType != Material.HUGE_MUSHROOM_1 && blockType != Material.HUGE_MUSHROOM_2) {
checkForDoubleDrop(player, blockState);
}
} }
Users.getPlayer(player).beginXpGain(SkillType.WOODCUTTING, xp); Users.getPlayer(player).beginXpGain(SkillType.WOODCUTTING, xp);