NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...

2018-07-19 05:42:43 +01:00
parent 3bcba64d28
commit 84c98c2ba8
422 changed files with 972 additions and 1950 deletions
--- a/Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
@@ -0,0 +1,92 @@
+From 4deb6973896972f14c56e83e4ef64ca3beee04e9 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 dd95773e..3924d00c 100644
+--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
+@@ -137,6 +137,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
+      */
+     public void closeInventory();
+ 
+    // Paper start
+    /**
+     * Force-closes the currently open inventory view for this player, if any.
+     */
+    public void closeInventory(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 19889b27..e6e45b93 100644
+--- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
+@@ -11,8 +11,58 @@ import org.bukkit.inventory.InventoryView;
+ public class InventoryCloseEvent extends InventoryEvent {
+     private static final HandlerList handlers = new HandlerList();
+ 
+    // Paper start
+    private final Reason reason;
+    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(InventoryView transaction) {
+        this(transaction, Reason.UNKNOWN);
+    }
+
+    public InventoryCloseEvent(InventoryView transaction, Reason reason) {
+         super(transaction);
+        this.reason = reason;
+        // Paper end
+     }
+ 
+     /**
+-- 
+2.18.0
+