Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Slight greenThumbWheat cleanup

Browse Source
This commit is contained in:
bm01 2013-02-16 03:42:56 +01:00
parent ef1a777180
commit 9c2ab19404
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,6 @@ public class Herbalism {
int herbLevel = profile.getSkillLevel(SkillType.HERBALISM); int herbLevel = profile.getSkillLevel(SkillType.HERBALISM);
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
boolean hasSeeds = false; boolean hasSeeds = false;
Location location = block.getLocation();
Material type = block.getType(); Material type = block.getType();
switch(type) { switch(type) {
@ -251,12 +250,18 @@ public class Herbalism {
break; break;
} }
if (!hasSeeds) {
return;
}
int activationChance = SkillTools.calculateActivationChance(Permissions.luckyHerbalism(player)); int activationChance = SkillTools.calculateActivationChance(Permissions.luckyHerbalism(player));
float chance = (float) (greenThumbMaxChance / greenThumbMaxLevel * herbLevel);
float chance = (float) ((greenThumbMaxChance / greenThumbMaxLevel) * herbLevel); if (chance > greenThumbMaxChance) {
if (chance > greenThumbMaxChance) chance = (float) greenThumbMaxChance; chance = (float) greenThumbMaxChance;
}
if (hasSeeds && (profile.getAbilityMode(AbilityType.GREEN_TERRA) || chance > Misc.getRandom().nextInt(activationChance))) { if (profile.getAbilityMode(AbilityType.GREEN_TERRA) || chance > Misc.getRandom().nextInt(activationChance)) {
switch(type) { switch(type) {
case CROPS: case CROPS:
inventory.removeItem(new ItemStack(Material.SEEDS)); inventory.removeItem(new ItemStack(Material.SEEDS));