Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

#1025 - Fix Custom Block Drop / Breaking Power Bug

Browse Source
This commit is contained in:
Rosenthalk0 2022-10-25 14:53:24 -05:00
parent d4a30f90f6
commit 165eb39714
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/CustomBlockListener.java
View File

@ -51,20 +51,34 @@ public class CustomBlockListener implements Listener {
CustomBlock block = opt.get();
final int power = MMOUtils.getPickaxePower(event.getPlayer());
if(block.requirePowerToBreak() && power < block.getRequiredPower()) {
event.setCancelled(true);
return;
if ( block.requirePowerToBreak() && block.getRequiredPower()>0 ){
if (power < block.getRequiredPower()) {
event.setCancelled(true);
return;
}
else if (power >= block.getRequiredPower()) {
event.setDropItems(false);
event.setExpToDrop(event.getPlayer().getGameMode() == GameMode.CREATIVE ? 0
: MMOUtils.getPickaxePower(event.getPlayer()) >= block.getRequiredPower()
? block.getMaxExpDrop() == 0 && block.getMinExpDrop() == 0 ? 0
: RANDOM.nextInt((block.getMaxExpDrop() - block.getMinExpDrop()) + 1) + block.getMinExpDrop()
: 0);
return;
}
event.setCancelled(true);
return;
}
event.setDropItems(false);
event.setExpToDrop(event.getPlayer().getGameMode() == GameMode.CREATIVE ? 0
: MMOUtils.getPickaxePower(event.getPlayer()) >= block.getRequiredPower()
? block.getMaxExpDrop() == 0 && block.getMinExpDrop() == 0 ? 0
: RANDOM.nextInt((block.getMaxExpDrop() - block.getMinExpDrop()) + 1) + block.getMinExpDrop()
: 0);
? block.getMaxExpDrop() == 0 && block.getMinExpDrop() == 0 ? 0
: RANDOM.nextInt((block.getMaxExpDrop() - block.getMinExpDrop()) + 1) + block.getMinExpDrop()
: 0);
}
@Deprecated
private static int getPickaxePower(Player player) {
return MMOUtils.getPickaxePower(player);