mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-07 20:24:51 +02:00
36f34f01c0
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
94 lines
2.9 KiB
Diff
94 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 3 Jul 2018 21:52:52 -0400
|
|
Subject: [PATCH] InventoryCloseEvent Reason API
|
|
|
|
Allows you to determine why an inventory was closed, enabling plugin developers
|
|
to "confirm" things based on if it was player triggered close or not.
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 2d413d720c828c7f334abde7eb02935317e2fd17..79569a329aa19ed954b9b65b78ef5d6d313501a1 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
*/
|
|
public void closeInventory();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Force-closes the currently open inventory view for this player, if any.
|
|
+ *
|
|
+ * @param reason why the inventory is closing
|
|
+ */
|
|
+ public void closeInventory(@NotNull org.bukkit.event.inventory.InventoryCloseEvent.Reason reason);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Returns the ItemStack currently in your hand, can be empty.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
|
|
index 5861247c1b8ee4fe2736fd5098e05a2ca9ab78ea..21ad8888c0e403bfc63518502577d651c02dda05 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
|
|
@@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull;
|
|
*/
|
|
public class InventoryCloseEvent extends InventoryEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
+ // Paper start
|
|
+ private final Reason reason;
|
|
+ @NotNull
|
|
+ public Reason getReason() {
|
|
+ return reason;
|
|
+ }
|
|
+
|
|
+ public enum Reason {
|
|
+ /**
|
|
+ * Unknown reason
|
|
+ */
|
|
+ UNKNOWN,
|
|
+ /**
|
|
+ * Player is teleporting
|
|
+ */
|
|
+ TELEPORT,
|
|
+ /**
|
|
+ * Player is no longer permitted to use this inventory
|
|
+ */
|
|
+ CANT_USE,
|
|
+ /**
|
|
+ * The chunk the inventory was in was unloaded
|
|
+ */
|
|
+ UNLOADED,
|
|
+ /**
|
|
+ * Opening new inventory instead
|
|
+ */
|
|
+ OPEN_NEW,
|
|
+ /**
|
|
+ * Closed
|
|
+ */
|
|
+ PLAYER,
|
|
+ /**
|
|
+ * Closed due to disconnect
|
|
+ */
|
|
+ DISCONNECT,
|
|
+ /**
|
|
+ * The player died
|
|
+ */
|
|
+ DEATH,
|
|
+ /**
|
|
+ * Closed by Bukkit API
|
|
+ */
|
|
+ PLUGIN,
|
|
+ }
|
|
|
|
public InventoryCloseEvent(@NotNull InventoryView transaction) {
|
|
+ this(transaction, Reason.UNKNOWN);
|
|
+ }
|
|
+
|
|
+ public InventoryCloseEvent(@NotNull InventoryView transaction, @NotNull Reason reason) {
|
|
super(transaction);
|
|
+ this.reason = reason;
|
|
+ // Paper end
|
|
}
|
|
|
|
/**
|