1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0036-LootTable-API.patch

@@ -1,4 +1,4 @@
-From 57c87e1ca56c7ea43bb0a4eba69000e7ab71a05d Mon Sep 17 00:00:00 2001
+From adbfe47db1430abf4f538b0dd7bc4aaebcdbff9a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
@@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object
 
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 new file mode 100644
-index 000000000..92d7b853a
+index 00000000..92d7b853
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 @@ -0,0 +1,17 @@
@@ -35,7 +35,7 @@ index 000000000..92d7b853a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 new file mode 100644
-index 000000000..b387894fe
+index 00000000..b387894f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 @@ -0,0 +1,17 @@
@@ -58,7 +58,7 @@ index 000000000..b387894fe
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 new file mode 100644
-index 000000000..97815eeb2
+index 00000000..97815eeb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 @@ -0,0 +1,116 @@
@@ -180,7 +180,7 @@ index 000000000..97815eeb2
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 new file mode 100644
-index 000000000..fd184f13f
+index 00000000..fd184f13
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 @@ -0,0 +1,45 @@
@@ -230,7 +230,7 @@ index 000000000..fd184f13f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index c67d71101..a569c7b63 100644
+index c67d7110..a569c7b6 100644
 --- a/src/main/java/org/bukkit/block/Chest.java
 +++ b/src/main/java/org/bukkit/block/Chest.java
 @@ -1,5 +1,7 @@
@@ -251,7 +251,7 @@ index c67d71101..a569c7b63 100644
      /**
       * Gets the inventory of the chest block represented by this block state.
 diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 74cd194c9..07af1a3f0 100644
+index 74cd194c..07af1a3f 100644
 --- a/src/main/java/org/bukkit/block/Dispenser.java
 +++ b/src/main/java/org/bukkit/block/Dispenser.java
 @@ -1,5 +1,6 @@
@@ -271,7 +271,7 @@ index 74cd194c9..07af1a3f0 100644
      /**
       * Gets the BlockProjectileSource object for the dispenser.
 diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
-index 424392fb5..c76202321 100644
+index 424392fb..c7620232 100644
 --- a/src/main/java/org/bukkit/block/Dropper.java
 +++ b/src/main/java/org/bukkit/block/Dropper.java
 @@ -1,11 +1,12 @@
@@ -289,7 +289,7 @@ index 424392fb5..c76202321 100644
      /**
       * Tries to drop a randomly selected item from the dropper's inventory,
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 58e493099..7ade312f1 100644
+index 58e49309..7ade312f 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
 @@ -1,8 +1,9 @@
@@ -304,7 +304,7 @@ index 58e493099..7ade312f1 100644
 -public interface Hopper extends Container, Lootable { }
 +public interface Hopper extends Container, LootableBlockInventory { } // Paper
 diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 938f9aead..42f5b4ea3 100644
+index 938f9aea..42f5b4ea 100644
 --- a/src/main/java/org/bukkit/block/ShulkerBox.java
 +++ b/src/main/java/org/bukkit/block/ShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -324,7 +324,7 @@ index 938f9aead..42f5b4ea3 100644
      /**
       * Get the {@link DyeColor} corresponding to this ShulkerBox
 diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-index 937b99f87..db69687a7 100644
+index 937b99f8..db69687a 100644
 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 @@ -1,5 +1,6 @@
@@ -344,7 +344,7 @@ index 937b99f87..db69687a7 100644
      /**
       * Checks whether or not this Minecart will pick up
 diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-index 9ea403e6f..238d118f7 100644
+index 9ea403e6..238d118f 100644
 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 @@ -1,5 +1,6 @@
@@ -362,7 +362,7 @@ index 9ea403e6f..238d118f7 100644
 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
  }
 diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index 24a3d989d..901db8524 100644
+index 24a3d989..901db852 100644
 --- a/src/main/java/org/bukkit/loot/Lootable.java
 +++ b/src/main/java/org/bukkit/loot/Lootable.java
 @@ -36,6 +36,34 @@ public interface Lootable {
@@ -401,5 +401,5 @@ index 24a3d989d..901db8524 100644
       * Set the seed used when this Loot Table generates loot.
       *
 -- 
-2.21.0
+2.25.0.windows.1