From 2c1ee10e164fae68b2b94bb5dea408bc562542cc Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Jun 2020 11:42:16 +1000 Subject: [PATCH] SPIGOT-5887: ClickType doesn't include off hand swaps --- src/main/java/org/bukkit/event/inventory/ClickType.java | 4 ++++ src/main/java/org/bukkit/event/inventory/InventoryAction.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/bukkit/event/inventory/ClickType.java b/src/main/java/org/bukkit/event/inventory/ClickType.java index a7440aac..eb665a8f 100644 --- a/src/main/java/org/bukkit/event/inventory/ClickType.java +++ b/src/main/java/org/bukkit/event/inventory/ClickType.java @@ -53,6 +53,10 @@ public enum ClickType { * Any action done with the Creative inventory open. */ CREATIVE, + /** + * The "swap item with offhand" key (defaults to F). + */ + SWAP_OFFHAND, /** * A type of inventory manipulation not yet recognized by Bukkit. *

diff --git a/src/main/java/org/bukkit/event/inventory/InventoryAction.java b/src/main/java/org/bukkit/event/inventory/InventoryAction.java index a7bc694b..e914873f 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryAction.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryAction.java @@ -68,10 +68,14 @@ public enum InventoryAction { /** * The clicked item is moved to the hotbar, and the item currently there * is re-added to the player's inventory. + * + * The hotbar includes the player's off hand. */ HOTBAR_MOVE_AND_READD, /** * The clicked slot and the picked hotbar slot are swapped. + * + * The hotbar includes the player's off hand. */ HOTBAR_SWAP, /**