From 946d845987258a72d3a4fb0171ad5a3070443ab4 Mon Sep 17 00:00:00 2001 From: bm01 Date: Tue, 22 Jan 2013 02:43:49 +0100 Subject: [PATCH] Fixed the merge, I think --- .../com/gmail/nossr50/skills/gathering/WoodCutting.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java index b78f6ba2c..10bfe449d 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java @@ -252,20 +252,12 @@ public class WoodCutting { if ((type & 0x8) == 0x8) type ^= 0x8; -<<<<<<< Upstream, based on origin/master - Material mat = Material.getMaterial(block.getTypeId()); - - int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillLevel); - if (chance > MAX_CHANCE) chance = MAX_CHANCE; -======= Material blockMaterial = block.getType(); - int randomChance = 100; int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * Users.getProfile(player).getSkillLevel(SkillType.WOODCUTTING)); if (chance > MAX_CHANCE) { chance = MAX_CHANCE; } ->>>>>>> f510cb2 Optimized Tree Feller And cleaned up WoodCutting a little int activationChance = Misc.calculateActivationChance(Permissions.luckyWoodcutting(player));