EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-29 20:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Begin trying to remove newly-deprecated "magic numbers"

Browse Source
This commit is contained in:
GJ
2013-09-05 14:55:08 -04:00
parent a639a37637
commit fd8d9b02a9
10 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,9 +103,9 @@ public final class Woodcutting {
else {
Location location = blockState.getLocation();
Tree tree = (Tree) blockState.getData();
ItemStack item = new ItemStack(Material.LOG, 1, tree.getSpecies().getData());
ItemStack item = tree.toItemStack(1);
switch (((Tree) blockState.getData()).getSpecies()) {
switch (tree.getSpecies()) {
case GENERIC:
if (Config.getInstance().getOakDoubleDropsEnabled()) {
Misc.dropItem(location, item);

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

@ -8,7 +8,6 @@ import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.Tree;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@ -161,18 +160,17 @@ public class WoodcuttingManager extends SkillManager {
Misc.randomDropItem(blockState.getLocation(), ModUtils.getCustomBlock(blockState).getItemDrop(), 10);
}
else {
Tree tree = (Tree) blockState.getData();
switch (material) {
case LOG:
if (canGetDoubleDrops()) {
Woodcutting.checkForDoubleDrop(blockState);
}
xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
Misc.dropItem(blockState.getLocation(), new ItemStack(Material.LOG, 1, tree.getSpecies().getData()));
Misc.dropItem(blockState.getLocation(), blockState.getData().toItemStack(1));
break;
case LEAVES:
Misc.randomDropItem(blockState.getLocation(), new ItemStack(Material.SAPLING, 1, tree.getSpecies().getData()), 10);
Misc.randomDropItem(blockState.getLocation(), blockState.getData().toItemStack(1), 10);
break;
default:
@ -180,7 +178,6 @@ public class WoodcuttingManager extends SkillManager {
}
}
blockState.setRawData((byte) 0x0);
blockState.setType(Material.AIR);
blockState.update(true);
}