fix: (not tested) placing a block on a bed without shift does not rem…

…ove the item from the inventory if the amount is one port of 0.2.32 commit c43bbcc
ScreamingSandals · May 4, 2024 · a2b3efe · a2b3efe
1 parent 43b37ee
commit a2b3efe
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/plugin/common/src/main/java/org/screamingsandals/bedwars/listener/PlayerListener.java b/plugin/common/src/main/java/org/screamingsandals/bedwars/listener/PlayerListener.java
@@ -58,6 +58,7 @@
 import org.screamingsandals.lib.event.OnEvent;
 import org.screamingsandals.lib.event.entity.*;
 import org.screamingsandals.lib.event.player.*;
+import org.screamingsandals.lib.item.builder.ItemStackFactory;
 import org.screamingsandals.lib.lang.Message;
 import org.screamingsandals.lib.placeholders.PlaceholderManager;
 import org.screamingsandals.lib.player.Player;
@@ -1005,7 +1006,15 @@ public void onPlayerInteract(PlayerInteractEvent event) {
                                         originalState.updateBlock(true, false);
                                     } else {
                                         if (!player.getGameMode().is("creative")) {
-                                            stack.changeAmount(stack.getAmount() - 1);
+                                            if (stack.getAmount() > 1) {
+                                                stack.changeAmount(stack.getAmount() - 1);
+                                            } else {
+                                                if (player.getPlayerInventory().getItemInOffHand().equals(stack)) {
+                                                    player.getPlayerInventory().setItemInOffHand(ItemStackFactory.getAir());
+                                                } else {
+                                                    player.getPlayerInventory().setItemInMainHand(ItemStackFactory.getAir());
+                                                }
+                                            }
                                         }
                                         if (!player.isSneaking()) {
                                             // TODO get right block place sound