mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
c97ce029e9
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason <jasonpenilla2@me.com> Co-authored-by: kashike <kashike@vq.lc> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: KennyTV <kennytv@t-online.de> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
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 7430bc85301d0fcb34c6035fbe08ae245c76e043..3418133d07250a7fd50caad8d97924b86fb30bad 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -153,6 +153,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
|
|
}
|
|
|
|
/**
|