Merge branch 'master' into pre/1.13

Spigot-API-Patches/0119-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From f9e5dde76a9d7df4e99e9677c7a09a8fbca3711b Mon Sep 17 00:00:00 2001
+From c2bc9239b19e43b8ef8d3a4c82aee6d692732b20 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
@@ -7,16 +7,18 @@ 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
+index dd95773e2..8fe01e47e 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
+@@ -137,6 +137,15 @@ 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.
++     *
++     * @param reason why the inventory is closing
 +     */
 +    public void closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason);
 +    // Paper end
@@ -25,7 +27,7 @@ index dd95773e..3924d00c 100644
       * 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
+index 19889b278..e6e45b936 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;