EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the merge, I think

Browse Source
This commit is contained in:
bm01 2013-01-22 02:43:49 +01:00
parent eef5df33b3
commit 946d845987
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,20 +252,12 @@ public class WoodCutting {
if ((type & 0x8) == 0x8) if ((type & 0x8) == 0x8)
type ^= 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(); Material blockMaterial = block.getType();
int randomChance = 100;
int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * Users.getProfile(player).getSkillLevel(SkillType.WOODCUTTING)); int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * Users.getProfile(player).getSkillLevel(SkillType.WOODCUTTING));
if (chance > MAX_CHANCE) { if (chance > MAX_CHANCE) {
chance = MAX_CHANCE; chance = MAX_CHANCE;
} }
>>>>>>> f510cb2 Optimized Tree Feller And cleaned up WoodCutting a little
int activationChance = Misc.calculateActivationChance(Permissions.luckyWoodcutting(player)); int activationChance = Misc.calculateActivationChance(Permissions.luckyWoodcutting(player));