Update Upstream

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,11 +1,11 @@
-From ac84151c8a02652a1137b7853894796dba4c3df3 Mon Sep 17 00:00:00 2001
+From 9576b81c87a4dfb2e3f672f6435779e65468e671 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:16:08 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 2ccc205..6e0250c 100644
+index 4b788b0..20159ad 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,35 +4,37 @@
@@ -87,7 +87,7 @@ index 2ccc205..6e0250c 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -107,6 +123,7 @@
+@@ -108,6 +124,7 @@
      </dependencies>
  
      <build>
@@ -95,7 +95,7 @@ index 2ccc205..6e0250c 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -129,26 +146,6 @@
+@@ -130,26 +147,6 @@
                  </dependencies>
              </plugin>
              <plugin>
@@ -122,7 +122,7 @@ index 2ccc205..6e0250c 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>2.4.3</version>
-@@ -161,8 +158,7 @@
+@@ -162,8 +159,7 @@
                      </execution>
                  </executions>
                  <configuration>

Spigot-API-Patches/0003-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 814fcd79c37cf32b74eb3a231ba4ff8e71d58c0a Mon Sep 17 00:00:00 2001
+From 30dc07b0d34561883d0c878ff8ad5f9b70c98cb2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3278,10 +3278,10 @@ index a8f61f2..0000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6368f9f..2c6a8f5 100644
+index 36094b5..b4a4ed5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1395,6 +1395,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1440,6 +1440,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }

Spigot-API-Patches/0004-Player-affects-spawning-API.patch

@@ -1,14 +1,14 @@
-From 00efa3c0c22089c8778084375d22a5ace948cd04 Mon Sep 17 00:00:00 2001
+From ccafae7c8b4e1ef3a9fece0582e1a2cacddddd00 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 54e8a5c..c86a65c 100644
+index b4a4ed5..b725fac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1284,6 +1284,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1329,6 +1329,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
@@ -30,5 +30,5 @@ index 54e8a5c..c86a65c 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.8.3
+2.10.2
 

Spigot-API-Patches/0007-Entity-Origin-API.patch

@@ -1,14 +1,14 @@
-From 9bfa695b5dc689ed703dd12078257d3411799997 Mon Sep 17 00:00:00 2001
+From 27d1d26ddfd181c7d237e8914dcf372291982e99 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 5c64b79..23524b8 100644
+index cf4118e..15cf7c0 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -463,4 +463,15 @@ public interface Entity extends Metadatable, CommandSender {
+@@ -440,4 +440,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
  
      Spigot spigot();
      // Spigot End

Spigot-API-Patches/0010-Add-player-view-distance-API.patch

@@ -1,14 +1,14 @@
-From e01015e7ba37c00ad49a8c3ba3e70835cd3ef913 Mon Sep 17 00:00:00 2001
+From 756f2d46975a869851859538a647c075dcbac53f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c86a65c..0945c59 100644
+index b725fac..bca09f0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1298,6 +1298,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1343,6 +1343,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setAffectsSpawning(boolean affects);
  
@@ -30,5 +30,5 @@ index c86a65c..0945c59 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.8.3
+2.10.2
 

Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From ffdfb6f2ae07ecf3724c90500e09c71370c93ccf Mon Sep 17 00:00:00 2001
+From 6767da41cfeee8b2ed1f1aa00d88af198fbc7a28 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b6a0b40..5b37396 100644
+index 5b0441a..5265d68 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -292,6 +292,26 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index b6a0b40..5b37396 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a1ce356..309fa3f 100644
+index de22136..c8d209e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -238,6 +238,22 @@ public interface Server extends PluginMessageRecipient {
@@ -64,10 +64,10 @@ index a1ce356..309fa3f 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0945c59..4c880b8 100644
+index bca09f0..3295674 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -345,6 +345,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -390,6 +390,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void sendMap(MapView map);
  
@@ -99,5 +99,5 @@ index 0945c59..4c880b8 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.9.2.windows.1
+2.10.2
 

Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 9e70beca6caf7d6007ad0b0ab6f050aab7c14a0e Mon Sep 17 00:00:00 2001
+From a33f233aea81e64704c2257ecb21570d9f340d59 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -369,7 +369,7 @@ index 0000000..e1ecd44
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4c880b8..bb31477 100644
+index 3295674..9f67d09 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -380,7 +380,7 @@ index 4c880b8..bb31477 100644
  import org.bukkit.Achievement;
  import org.bukkit.ChatColor;
  import org.bukkit.Effect;
-@@ -367,6 +368,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -412,6 +413,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @param components the components to send
       */
      public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components);
@@ -497,7 +497,7 @@ index 4c880b8..bb31477 100644
      // Paper end
  
      /**
-@@ -1111,7 +1222,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1156,7 +1267,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * Resets the title displayed to the player.
       * @deprecated API subject to change.
       */
@@ -507,5 +507,5 @@ index 4c880b8..bb31477 100644
  
  
 -- 
-2.9.2.windows.1
+2.10.2
 

Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -1,4 +1,4 @@
-From bf151a7ca10280dff0ce41fe2ebbcce4bb2e1ad7 Mon Sep 17 00:00:00 2001
+From b7c4b62a1912e41a56a29d095248312c8a8f2699 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@@ -40,10 +40,10 @@ index 148756b..4ad0028 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bb31477..99f148c 100644
+index 9f67d09..5b7ca6a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -352,6 +352,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *
       * @param component the components to send
       */
@@ -51,7 +51,7 @@ index bb31477..99f148c 100644
      public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component);
  
      /**
-@@ -359,6 +360,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -404,6 +405,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       *
       * @param components the components to send
       */
@@ -60,5 +60,5 @@ index bb31477..99f148c 100644
  
      /**
 -- 
-2.9.2.windows.1
+2.10.2
 

Spigot-API-Patches/0022-Complete-resource-pack-API.patch

@@ -1,14 +1,14 @@
-From 844f5ad7531209eaaa783727c8bbdab094b69900 Mon Sep 17 00:00:00 2001
+From 0ad996239d917bd7aa348a18cf373706991644e1 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 99f148c..1498349 100644
+index 5b7ca6a..ac58f3a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1121,7 +1121,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1166,7 +1166,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 99f148c..1498349 100644
      public void setResourcePack(String url);
  
      /**
-@@ -1449,6 +1451,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1494,6 +1496,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void setViewDistance(int viewDistance);
  
@@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
       * Gets the status of this pack.
       *
 -- 
-2.9.2.windows.1
+2.10.2
 

Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From 26c8d481578cd7a29103c0c3d22939dfd0c85d63 Mon Sep 17 00:00:00 2001
+From fc030252b9016bc9ab114383c13d6e1ddc5e347e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index f1c9e34..400968f 100644
+index 93e3c3b..b0eba81 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -133,6 +133,12 @@
+@@ -134,6 +134,12 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
@@ -395,5 +395,5 @@ index d8b9c24..40fd71d 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.10.0.windows.1
+2.10.2
 

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

@@ -1,4 +1,4 @@
-From 3cee88900b20b75852cff22796567415d3bed5c5 Mon Sep 17 00:00:00 2001
+From ca84cb2143adcd3dbbb2f3143e9088add4e2ee28 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
@@ -295,12 +295,13 @@ index 0000000..2169493
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index e941d8b..a2f8f53 100644
+index ade09dd..368306d 100644
 --- a/src/main/java/org/bukkit/block/Chest.java
 +++ b/src/main/java/org/bukkit/block/Chest.java
-@@ -1,12 +1,13 @@
+@@ -1,13 +1,14 @@
  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,18 +309,19 @@ index e941d8b..a2f8f53 100644
  /**
   * Represents a chest.
   */
--public interface Chest extends BlockState, InventoryHolder, Lockable {
+-public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
-+public interface Chest extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
++public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
  
      /**
       * Returns the chest's inventory. If this is a double chest, it returns
 diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 94d360b..b80cb5f 100644
+index 39ee9b0..236ffa3 100644
 --- a/src/main/java/org/bukkit/block/Dispenser.java
 +++ b/src/main/java/org/bukkit/block/Dispenser.java
-@@ -1,12 +1,13 @@
+@@ -1,13 +1,14 @@
  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,28 +329,29 @@ index 94d360b..b80cb5f 100644
  /**
   * Represents a dispenser.
   */
--public interface Dispenser extends BlockState, InventoryHolder, Lockable {
+-public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
-+public interface Dispenser extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
++public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
  
      /**
       * Gets the BlockProjectileSource object for this dispenser.
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 978cf2a..d8c8abd 100644
+index 8e5e3e8..c08a1a5 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
-@@ -1,10 +1,11 @@
+@@ -1,9 +1,12 @@
  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, Nameable { }
-+public interface Hopper extends BlockState, InventoryHolder, Lockable, LootableInventory { // Paper
++public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
- 
++
- }
++}
 -- 
-2.9.3
+2.10.2
 

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,11 +1,11 @@
-From 8c8e0a712b18892ec8be649e2833253515115a00 Mon Sep 17 00:00:00 2001
+From fde1282d4783577f1f4212c58f6cf3d80e8b11cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
 diff --git a/pom.xml b/pom.xml
-index cb22454..0de362d 100644
+index 2fa1925..911c0a9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -625,7 +625,7 @@ index e148e37..e0276a6 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0fbec05..c19bf3a 100644
+index 4617473..3756f25 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -969,7 +969,7 @@ index ae427b4..ce3390c 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c2e13f..a5aa755 100644
+index 9ab1e5d..4f1a6a3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1602,7 +1602,7 @@ index 3a95b44..b5efb9c 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e83f56f..3784c32 100644
+index 055c907..dc2937f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1622,7 +1622,7 @@ index e83f56f..3784c32 100644
  import org.bukkit.craftbukkit.map.CraftMapView;
  import org.bukkit.craftbukkit.map.RenderData;
  import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
-@@ -1564,6 +1558,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1584,6 +1578,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }

Spigot-Server-Patches/0017-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From 7e906e2d453bbdae56d399a03f9e3f5f640d15c8 Mon Sep 17 00:00:00 2001
+From ea184158bdd0f5ef703f5c697c2172c4e9173ca3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
@@ -70,10 +70,10 @@ index 52171a3..3d70c50 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3784c32..3bda255 100644
+index dc2937f..7933963 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1427,6 +1427,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1447,6 +1447,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      }
  

Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch

@@ -1,14 +1,14 @@
-From b9c6bdb7d61d314397dc9f1426d80b23b8f43eee Mon Sep 17 00:00:00 2001
+From 93c4881b3e9fe063686904ee04c600e592ebf918 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3bda255..0267e50 100644
+index 7933963..fa781b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1151,12 +1151,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1171,12 +1171,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {

Spigot-Server-Patches/0037-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From f6252bf66202b9b23dada7c611dd52c534537efb Mon Sep 17 00:00:00 2001
+From 09ca89155a76f70c0a7119cf0495a9352d5de6b5 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -194,10 +194,10 @@ index ce3390c..5db113c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0267e50..2a577d5 100644
+index fa781b7..e1b04cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1438,6 +1438,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().affectsSpawning;
      }
  

Spigot-Server-Patches/0063-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From f695528c786fa0ba4446cf32c56068fb474f9982 Mon Sep 17 00:00:00 2001
+From 94b4bd63864958e0a8d27e2844acea2ddd2103d5 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,10 +25,10 @@ index ed63854..7005d69 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ab467d8..1f5746a 100644
+index 6a6d5de..a4ba222 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -572,7 +572,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -592,7 +592,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {

Spigot-Server-Patches/0068-Complete-resource-pack-API.patch

@@ -1,11 +1,11 @@
-From af11a3d45c195c64f6141c4bb0a496fc3c9c0cc5 Mon Sep 17 00:00:00 2001
+From ff06a8ff1eb92a2fb1c58c49ba29a78b93745be4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bc35bc5..724b9ad 100644
+index 2d0e6a1..a6013f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1010,7 +1010,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,7 +24,7 @@ index bc35bc5..724b9ad 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f5746a..f6b791b 100644
+index a4ba222..99a7ea6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -38,7 +38,7 @@ index 1f5746a..f6b791b 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1544,6 +1548,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1564,6 +1568,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
      }
  

Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From fa2c964cc53890971c8a61c71ba4056ed2cd289c Mon Sep 17 00:00:00 2001
+From d1b1fe4fb9ac3c9b87237895bec3008621fca0ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4cc89ec..7a96447 100644
+index cc00fde..39609f7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,10 +44,10 @@ index 4cc89ec..7a96447 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f6b791b..486ba73 100644
+index 99a7ea6..88a19a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1410,6 +1410,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {

Spigot-Server-Patches/0116-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 1e94ddba176b1abc7250080df04e7e0a2eb61404 Mon Sep 17 00:00:00 2001
+From 1c728d40587a71f8a41b47845ff144fdd5e242e6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 486ba73..4cb9a82 100644
+index 88a19a8..2eaf502 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -582,6 +582,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -602,6 +602,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  

Spigot-Server-Patches/0125-Implement-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 3ca88a5f9d09958ab96c851eef8f336fd3ea70ac Mon Sep 17 00:00:00 2001
+From 6f8815bed9d7566fe1ee56912eac4bae1e635dde Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -34,10 +34,10 @@ index feb07a3..83f3317 100644
          this.ch = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4cb9a82..02f8852 100644
+index 2eaf502..80b3fba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1675,7 +1675,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1695,7 +1695,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {

Spigot-Server-Patches/0134-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,4 +1,4 @@
-From 6f5b71b26d1b422006ec176d1f343df159bf418b Mon Sep 17 00:00:00 2001
+From 0e03fc3328c07b66787473c4d9bd922264a973a3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -653,7 +653,7 @@ index 5632f2e..01d0d80 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index f15c26b..9c43cbe 100644
+index 3de7e14..6cab545 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,5 +1,6 @@
@@ -667,13 +667,13 @@ index f15c26b..9c43cbe 100644
  import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
  import org.bukkit.inventory.Inventory;
  
--public class CraftChest extends CraftContainer implements Chest {
+-public class CraftChest extends CraftLootable implements Chest {
-+public class CraftChest extends CraftContainer implements Chest, CraftLootableBlockInventory { // Paper
++public class CraftChest extends CraftLootable implements Chest, CraftLootableBlockInventory { // Paper
      private final CraftWorld world;
      private final TileEntityChest chest;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 003381a..d70281d 100644
+index cc0d28f..1b28e8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -687,13 +687,13 @@ index 003381a..d70281d 100644
  import org.bukkit.inventory.Inventory;
  import org.bukkit.projectiles.BlockProjectileSource;
  
--public class CraftDispenser extends CraftContainer implements Dispenser {
+-public class CraftDispenser extends CraftLootable implements Dispenser {
-+public class CraftDispenser extends CraftContainer implements Dispenser, CraftLootableBlockInventory { // Paper
++public class CraftDispenser extends CraftLootable implements Dispenser, CraftLootableBlockInventory { // Paper
      private final CraftWorld world;
      private final TileEntityDispenser dispenser;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index f155790..acad8bc 100644
+index b7a04bd..5d4a551 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -707,8 +707,8 @@ index f155790..acad8bc 100644
  import org.bukkit.craftbukkit.inventory.CraftInventory;
  import org.bukkit.inventory.Inventory;
  
--public class CraftHopper extends CraftContainer implements Hopper {
+-public class CraftHopper extends CraftLootable implements Hopper {
-+public class CraftHopper extends CraftContainer implements Hopper, CraftLootableBlockInventory { // Paper
++public class CraftHopper extends CraftLootable implements Hopper, CraftLootableBlockInventory { // Paper
      private final TileEntityHopper hopper;
  
      public CraftHopper(final Block block) {

Spigot-Server-Patches/0151-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -1,4 +1,4 @@
-From 98b9b014ef0cb3adedc68bdbdb0f78588ed3603c Mon Sep 17 00:00:00 2001
+From 4728b78cc78eb596816d42f9b41de657ed80c243 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -127,10 +127,10 @@ index 8f6f3a0..eae9276 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0866f54..49b5389 100644
+index 18d0323..1296c17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1524,7 +1524,7 @@ public class CraftWorld implements World {
+@@ -1533,7 +1533,7 @@ public class CraftWorld implements World {
          ChunkProviderServer cps = world.getChunkProviderServer();
          for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
              // If in use, skip it

work/Bukkit

@@ -1 +1 @@
-Subproject commit be7be5128d751e5c2f266b02f71b18404a0c37d7
+Subproject commit 22a06ed73abb6076daa7b1d32643a6f71799cac8

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f15e07b1a9a4aedbcb77cb7776f168adcfebfa7e
+Subproject commit ead445ec995e66378957ed400f1b4c698febfb9f