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

Actually use Hylian Treasure config values. Fixes #2688

Browse Source
This commit is contained in:
t00thpick1 2015-11-04 13:35:25 -05:00
parent aa796266a7
commit 9b24dd306c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -4,6 +4,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import org.bukkit.CropState; import org.bukkit.CropState;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.NetherWartsState; import org.bukkit.NetherWartsState;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
@ -235,15 +236,24 @@ public class HerbalismManager extends SkillManager {
Player player = getPlayer(); Player player = getPlayer();
if (treasures.isEmpty() || !EventUtils.simulateBlockBreak(blockState.getBlock(), player, false)) { if (treasures.isEmpty()) {
return false; return false;
} }
int skillLevel = getSkillLevel();
Location location = blockState.getLocation();
blockState.setType(Material.AIR); for (HylianTreasure treasure : treasures) {
if (skillLevel >= treasure.getDropLevel() && SkillUtils.treasureDropSuccessful(getPlayer(), treasure.getDropChance(), activationChance)) {
Misc.dropItem(blockState.getLocation(), treasures.get(Misc.getRandom().nextInt(treasures.size())).getDrop()); if (!EventUtils.simulateBlockBreak(blockState.getBlock(), player, false)) {
player.sendMessage(LocaleLoader.getString("Herbalism.HylianLuck")); return false;
return true; }
blockState.setType(Material.AIR);
Misc.dropItem(location, treasure.getDrop());
player.sendMessage(LocaleLoader.getString("Herbalism.HylianLuck"));
return true;
}
}
return false;
} }
/** /**