EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-04-04 18:56:23 +02:00
Code Issues Projects Releases Wiki Activity

More tweaks to Tree Feller

Browse Source
This commit is contained in:
nossr50 2012-02-23 01:59:00 -08:00
parent 86166a58e1
commit 37364d6c86
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/skills/Herbalism.java
View File

@ -143,6 +143,7 @@ public class Herbalism
mat = Material.getMaterial(296); mat = Material.getMaterial(296);
is = new ItemStack(mat, 1, (byte)0, (byte)0); is = new ItemStack(mat, 1, (byte)0, (byte)0);
PP.addXP(SkillType.HERBALISM, LoadProperties.mwheat, player); PP.addXP(SkillType.HERBALISM, LoadProperties.mwheat, player);
if(player != null) if(player != null)
{ {
if(herbLevel > 1000 || (Math.random() * 1000 <= herbLevel)) if(herbLevel > 1000 || (Math.random() * 1000 <= herbLevel))

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

@ -60,7 +60,7 @@ public class WoodCutting
private static void removeBlocks(ArrayList<Block> toBeFelled, Player player, PlayerProfile PP, mcMMO plugin) private static void removeBlocks(ArrayList<Block> toBeFelled, Player player, PlayerProfile PP, mcMMO plugin)
{ {
int durabilityLoss = 0; int durabilityLoss = 0, xp = 0;
for(Block x : toBeFelled) for(Block x : toBeFelled)
{ {
@ -78,7 +78,7 @@ public class WoodCutting
if(!plugin.misc.blockWatchList.contains(x)) if(!plugin.misc.blockWatchList.contains(x))
{ {
WoodCutting.woodCuttingProcCheck(player, x); WoodCutting.woodCuttingProcCheck(player, x);
int xp = 0;
switch(x.getData()) switch(x.getData())
{ {
@ -92,8 +92,6 @@ public class WoodCutting
xp += LoadProperties.mbirch; xp += LoadProperties.mbirch;
break; break;
} }
PP.addXP(SkillType.WOODCUTTING, xp, player);
} }
//Drop the block //Drop the block
@ -125,6 +123,9 @@ public class WoodCutting
} }
} }
PP.addXP(SkillType.WOODCUTTING, xp, player);
Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
if(LoadProperties.toolsLoseDurabilityFromAbilities) if(LoadProperties.toolsLoseDurabilityFromAbilities)
{ {
if(!player.getItemInHand().containsEnchantment(Enchantment.DURABILITY)) if(!player.getItemInHand().containsEnchantment(Enchantment.DURABILITY))