Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-27 11:38:03 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary synchronized block and allow for custom drop amount

Browse Source
This commit is contained in:
Felix Cravic 2020-12-08 00:12:49 +01:00
parent 99f4c8f2d3
commit 716e2ea5ef
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
View File

@ -102,7 +102,7 @@ public class PlayerDiggingListener {
final StackingRule stackingRule = handItem.getStackingRule(); final StackingRule stackingRule = handItem.getStackingRule();
final int handAmount = stackingRule.getAmount(handItem); final int handAmount = stackingRule.getAmount(handItem);
if (handAmount == dropAmount) { if (handAmount <= dropAmount) {
// Drop the whole item without copy // Drop the whole item without copy
dropItem(player, handItem, ItemStack.getAirItem()); dropItem(player, handItem, ItemStack.getAirItem());
} else { } else {
@ -132,10 +132,8 @@ public class PlayerDiggingListener {
case SWAP_ITEM_HAND: case SWAP_ITEM_HAND:
PlayerSwapItemEvent swapItemEvent = new PlayerSwapItemEvent(player, offHand, mainHand); PlayerSwapItemEvent swapItemEvent = new PlayerSwapItemEvent(player, offHand, mainHand);
player.callCancellableEvent(PlayerSwapItemEvent.class, swapItemEvent, () -> { player.callCancellableEvent(PlayerSwapItemEvent.class, swapItemEvent, () -> {
synchronized (playerInventory) { playerInventory.setItemInMainHand(swapItemEvent.getMainHandItem());
playerInventory.setItemInMainHand(swapItemEvent.getMainHandItem()); playerInventory.setItemInOffHand(swapItemEvent.getOffHandItem());
playerInventory.setItemInOffHand(swapItemEvent.getOffHandItem());
}
}); });
break; break;
} }