From 7d73fa7ae00cd12e97284ab37482831ee835c47a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Nov 2016 23:58:56 -0500
Subject: [PATCH] Update Upstream

---
 Spigot-API-Patches/Entity-Origin-API.patch    |  2 +-
 Spigot-API-Patches/LootTable-API.patch        | 19 +++++++++++--------
 ...-API-Replenishable-Lootables-Feature.patch | 12 ++++++------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Spigot-API-Patches/Entity-Origin-API.patch b/Spigot-API-Patches/Entity-Origin-API.patch
index b65143304e..eb411f71d8 100644
--- a/Spigot-API-Patches/Entity-Origin-API.patch
+++ b/Spigot-API-Patches/Entity-Origin-API.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
  
      Spigot spigot();
      // Spigot End
diff --git a/Spigot-API-Patches/LootTable-API.patch b/Spigot-API-Patches/LootTable-API.patch
index 9de66287bc..53d8c18996 100644
--- a/Spigot-API-Patches/LootTable-API.patch
+++ b/Spigot-API-Patches/LootTable-API.patch
@@ -301,6 +301,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
  package org.bukkit.block;
  
+ import org.bukkit.Nameable;
 +import com.destroystokyo.paper.loottable.LootableInventory; // Paper
  import org.bukkit.inventory.Inventory;
  import org.bukkit.inventory.InventoryHolder;
@@ -308,8 +309,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  /**
   * Represents a chest.
   */
--public interface Chest extends BlockState, InventoryHolder, Lockable {
-+public interface Chest extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
+-public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
++public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
  
      /**
       * Returns the chest's inventory. If this is a double chest, it returns
@@ -320,6 +321,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
  package org.bukkit.block;
  
+ import org.bukkit.Nameable;
 +import com.destroystokyo.paper.loottable.LootableInventory; // Paper
  import org.bukkit.inventory.InventoryHolder;
  import org.bukkit.projectiles.BlockProjectileSource;
@@ -327,8 +329,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  /**
   * Represents a dispenser.
   */
--public interface Dispenser extends BlockState, InventoryHolder, Lockable {
-+public interface Dispenser extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
+-public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
++public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
  
      /**
       * Gets the BlockProjectileSource object for this dispenser.
@@ -339,14 +341,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
  package org.bukkit.block;
  
+ import org.bukkit.Nameable;
 +import com.destroystokyo.paper.loottable.LootableInventory; // Paper
  import org.bukkit.inventory.InventoryHolder;
  
  /**
   * Represents a hopper.
   */
--public interface Hopper extends BlockState, InventoryHolder, Lockable {
-+public interface Hopper extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
- 
- }
+-public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable { }
++public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
++
++}
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
index 60683674b4..cd0a3e252e 100644
--- a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
@@ -667,8 +667,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
  import org.bukkit.inventory.Inventory;
  
--public class CraftChest extends CraftContainer implements Chest {
-+public class CraftChest extends CraftContainer implements Chest, CraftLootableBlockInventory { // Paper
+-public class CraftChest extends CraftLootable implements Chest {
++public class CraftChest extends CraftLootable implements Chest, CraftLootableBlockInventory { // Paper
      private final CraftWorld world;
      private final TileEntityChest chest;
  
@@ -687,8 +687,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.inventory.Inventory;
  import org.bukkit.projectiles.BlockProjectileSource;
  
--public class CraftDispenser extends CraftContainer implements Dispenser {
-+public class CraftDispenser extends CraftContainer implements Dispenser, CraftLootableBlockInventory { // Paper
+-public class CraftDispenser extends CraftLootable implements Dispenser {
++public class CraftDispenser extends CraftLootable implements Dispenser, CraftLootableBlockInventory { // Paper
      private final CraftWorld world;
      private final TileEntityDispenser dispenser;
  
@@ -707,8 +707,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.craftbukkit.inventory.CraftInventory;
  import org.bukkit.inventory.Inventory;
  
--public class CraftHopper extends CraftContainer implements Hopper {
-+public class CraftHopper extends CraftContainer implements Hopper, CraftLootableBlockInventory { // Paper
+-public class CraftHopper extends CraftLootable implements Hopper {
++public class CraftHopper extends CraftLootable implements Hopper, CraftLootableBlockInventory { // Paper
      private final TileEntityHopper hopper;
  
      public CraftHopper(final Block block) {
diff --git a/work/Bukkit b/work/Bukkit
index be7be5128d..22a06ed73a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit be7be5128d751e5c2f266b02f71b18404a0c37d7
+Subproject commit 22a06ed73abb6076daa7b1d32643a6f71799cac8
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f15e07b1a9..ead445ec99 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f15e07b1a9a4aedbcb77cb7776f168adcfebfa7e
+Subproject commit ead445ec995e66378957ed400f1b4c698febfb9f