From 716e2ea5efd89206f9f44ea77161c9eb8c41f3a5 Mon Sep 17 00:00:00 2001
From: Felix Cravic <themode@outlook.fr>
Date: Tue, 8 Dec 2020 00:12:49 +0100
Subject: [PATCH] Remove unnecessary synchronized block and allow for custom
 drop amount

---
 .../minestom/server/listener/PlayerDiggingListener.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
index a11278285..523822176 100644
--- a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
+++ b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
@@ -102,7 +102,7 @@ public class PlayerDiggingListener {
                 final StackingRule stackingRule = handItem.getStackingRule();
                 final int handAmount = stackingRule.getAmount(handItem);
 
-                if (handAmount == dropAmount) {
+                if (handAmount <= dropAmount) {
                     // Drop the whole item without copy
                     dropItem(player, handItem, ItemStack.getAirItem());
                 } else {
@@ -132,10 +132,8 @@ public class PlayerDiggingListener {
             case SWAP_ITEM_HAND:
                 PlayerSwapItemEvent swapItemEvent = new PlayerSwapItemEvent(player, offHand, mainHand);
                 player.callCancellableEvent(PlayerSwapItemEvent.class, swapItemEvent, () -> {
-                    synchronized (playerInventory) {
-                        playerInventory.setItemInMainHand(swapItemEvent.getMainHandItem());
-                        playerInventory.setItemInOffHand(swapItemEvent.getOffHandItem());
-                    }
+                    playerInventory.setItemInMainHand(swapItemEvent.getMainHandItem());
+                    playerInventory.setItemInOffHand(swapItemEvent.getOffHandItem());
                 });
                 break;
         }