aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHy3z <[email protected]>2024-04-12 21:19:55 +0200
committerGitHub <[email protected]>2024-04-12 15:19:55 -0400
commit8fe90dede7364a3c4aec17c4ef191b946f43d96e (patch)
treeb2c2b95813be96fe1d0f079c6f9c7b2b22b8dac7
parent526795bacd07c019fe3652c96d74cc9f91ecb1fd (diff)
downloadPaper-8fe90dede7364a3c4aec17c4ef191b946f43d96e.tar.gz
Paper-8fe90dede7364a3c4aec17c4ef191b946f43d96e.zip
[ci skip] Referenced InventoryDragEvent in documentation of InventoryClickEvent (#10395)
-rw-r--r--patches/api/0056-Fix-upstream-javadocs.patch12
-rw-r--r--patches/api/0173-Fix-Spigot-annotation-mistakes.patch4
2 files changed, 11 insertions, 5 deletions
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index f221402975..f31a77e295 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0056-Fix-upstream-javadocs.patch
@@ -850,10 +850,16 @@ index 1440c6115520d692faf75455df35b92aa8734491..0808e7aeffb69160913344de5b5e21d5
public class FurnaceStartSmeltEvent extends InventoryBlockStartEvent {
private static final HandlerList handlers = new HandlerList();
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-index 79797a2be7fb139d528116d34d13e51d39b96e56..fe58058f9b5d29388d48115cc81dc48ab08c58c1 100644
+index 79797a2be7fb139d528116d34d13e51d39b96e56..f2a2a2ad9930499c5bf624e73571a3294a90db14 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-@@ -19,9 +19,10 @@ import org.jetbrains.annotations.Nullable;
+@@ -16,12 +16,16 @@ import org.jetbrains.annotations.Nullable;
+ /**
+ * This event is called when a player clicks in an inventory.
+ * <p>
++ * In case of a drag action within an inventory, InventoryClickEvent is never called.
++ * Instead, {@link InventoryDragEvent} is called at the end of the drag.
++ * <p>
* Because InventoryClickEvent occurs within a modification of the Inventory,
* not all Inventory related methods are safe to use.
* <p>
@@ -867,7 +873,7 @@ index 79797a2be7fb139d528116d34d13e51d39b96e56..fe58058f9b5d29388d48115cc81dc48a
* <ul>
* <li>{@link HumanEntity#closeInventory()}
* <li>{@link HumanEntity#openInventory(Inventory)}
-@@ -92,7 +93,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
+@@ -92,7 +96,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
/**
* Gets the ItemStack currently in the clicked slot.
*
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
index 5a9e1829f9..8145eed098 100644
--- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
@@ -1150,10 +1150,10 @@ index 80a0a4ad813d6453b30273d25942e6612bb05c1b..18bb808e73c7a78f367ccdb44d5fe12b
this.inventory = inventory;
this.containerType = containerType;
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-index fe58058f9b5d29388d48115cc81dc48ab08c58c1..ac67a4e321f43d1ede09dafe2daa1f07de8a923f 100644
+index f2a2a2ad9930499c5bf624e73571a3294a90db14..c8540a42ab44647fdd112ce4f731f3dc0df552f4 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-@@ -85,7 +85,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
+@@ -88,7 +88,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
*
* @return the cursor ItemStack
*/