remove ones

PaperMC · Jan 4, 2025 · def89f3 · def89f3
1 parent 809f896
commit def89f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/paper-api/src/main/java/org/bukkit/event/inventory/InventoryAction.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryAction.java
@@ -105,10 +105,6 @@ public enum InventoryAction {
      * Some of the items on the clicked slot are moved into the bundle on the cursor.
      */
     PICKUP_SOME_INTO_BUNDLE,
-    /**
-     * One of the items on the clicked slot is moved into the bundle on the cursor.
-     */
-    PICKUP_ONE_INTO_BUNDLE,
     /**
      * The first stack of items is moved to the clicked slot.
      */
@@ -121,9 +117,5 @@ public enum InventoryAction {
      * Some of the items on the cursor are moved into the bundle in the clicked slot.
      */
     PLACE_SOME_INTO_BUNDLE,
-    /**
-     * One of the items on the cursor is moved into the bundle in the clicked slot.
-     */
-    PLACE_ONE_INTO_BUNDLE,
     ;
 }
diff --git a/...rver/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/...rver/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -2017,7 +2017,7 @@
                  this.player.containerMenu.sendAllDataToRemote();
              } else if (!this.player.containerMenu.stillValid(this.player)) {
                  LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
-@@ -1713,7 +_,352 @@
+@@ -1713,7 +_,348 @@
                  } else {
                      boolean flag = packet.getStateId() != this.player.containerMenu.getStateId();
                      this.player.containerMenu.suppressRemoteUpdates();
@@ -2093,8 +2093,6 @@
 +                                                        int toPickup = new net.minecraft.world.item.component.BundleContents.Mutable(cursor.get(DataComponents.BUNDLE_CONTENTS)).getMaxAmountToAdd(slot.getItem());
 +                                                        if (toPickup >= slot.getItem().getCount()) {
 +                                                            action = InventoryAction.PICKUP_ALL_INTO_BUNDLE;
-+                                                        } else if (toPickup == 1) {
-+                                                            action = InventoryAction.PICKUP_ONE_INTO_BUNDLE;
 +                                                        } else if (toPickup == 0) {
 +                                                            action = InventoryAction.NOTHING;
 +                                                        } else {
@@ -2104,8 +2102,6 @@
 +                                                        int toPickup = new net.minecraft.world.item.component.BundleContents.Mutable(slot.getItem().get(DataComponents.BUNDLE_CONTENTS)).getMaxAmountToAdd(cursor);
 +                                                        if (toPickup >= cursor.getCount()) {
 +                                                            action = InventoryAction.PLACE_ALL_INTO_BUNDLE;
-+                                                        } else if (toPickup == 1) {
-+                                                            action = InventoryAction.PLACE_ONE_INTO_BUNDLE;
 +                                                        } else if (toPickup == 0) {
 +                                                            action = InventoryAction.NOTHING;
 +                                                        } else {