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

Merge pull request #392 from TfT-02/master

Browse Source 
Various fixed for issues in the issue tracker
This commit is contained in:
TfT_02
2012-12-30 15:03:12 -08:00
parent c0bba7dead 2968803f29
commit eed8a57ff9
26 changed files with 1176 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java
View File

@ -7,6 +7,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.TreeSpecies;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.inventory.ItemStack;
@ -65,9 +66,13 @@ public class WoodCutting {
return;
}
int durabilityLoss = durabilityLossCalulate(toBeFelled);
int xp = 0;
ItemStack inHand = player.getItemInHand();
int level = 0;
if (inHand.containsEnchantment(Enchantment.DURABILITY)) {
level = inHand.getEnchantmentLevel(Enchantment.DURABILITY);
}
int durabilityLoss = durabilityLossCalulate(toBeFelled, level);
/* This is to prevent using wood axes everytime you tree fell */
if (ModChecks.isCustomTool(inHand)) {
@ -79,7 +84,6 @@ public class WoodCutting {
if (health >= 2) {
Combat.dealDamage(player, random.nextInt(health - 1));
}
return;
}
}
else if ((inHand.getDurability() + durabilityLoss >= inHand.getType().getMaxDurability()) || inHand.getType().equals(Material.AIR)) {
@ -90,7 +94,6 @@ public class WoodCutting {
if (health >= 2) {
Combat.dealDamage(player, random.nextInt(health - 1));
}
return;
}
/* Damage the tool */
@ -493,11 +496,11 @@ public class WoodCutting {
}
}
private static int durabilityLossCalulate(ArrayList<Block> toBeFelled) {
private static int durabilityLossCalulate(ArrayList<Block> toBeFelled, int level) {
int durabilityLoss = 0;
for (Block x : toBeFelled) {
if (x.getType().equals(Material.LOG) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLogBlock(x))) {
durabilityLoss++;
if (random.nextInt(level + 1) > 0) {}//Don't add durabilityLoss, because Unbreaking enchantment does it's work.
else if (x.getType().equals(Material.LOG) || (Config.getInstance().getBlockModsEnabled() && ModChecks.isCustomLogBlock(x))) {
durabilityLoss = durabilityLoss + Config.getInstance().getAbilityToolDamage();
}
}