Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-03 06:37:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1025-Custom-Block-Break-and-Drops-Error'

Browse Source
This commit is contained in:
Indyuce 2022-11-03 18:12:44 +01:00
commit 49d92288d8
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,19 +52,33 @@ public class CustomBlockListener implements Listener {
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);