Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity)
1dc91b15 Add specific notes about what is not API
2b05ef88 #484: Allow statistics to be accessed for offline players

CraftBukkit Changes:
f7d6ad53 SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable
5838285d SPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooks
f325b9be SPIGOT-5641: Add Block.getDrops(ItemStack, Entity)
e25a2272 Fix some formatting in CraftHumanEntity
498540e0 Add Merchant slot delegate
b2de47d5 SPIGOT-5621: Add missing container types for opening InventoryView
aa3a2f27 #645: Allow statistics to be accessed for offline players
2122c0b1 #649: CraftBell should implement Bell

18 files changed, 75 insertions, 75 deletions

diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch
index ba560e56d0..44de6496aa 100644
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 1259145a44b220f48c733e013571a00df801065f Mon Sep 17 00:00:00 2001
+From 1765e5585c2c52e2ea84b77aeaeccef7c5e4192e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3711,10 +3711,10 @@ index 2a145d851..000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9b0153f7d..9d82a691a 100644
+index 92bafd636..bfbe775fc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1573,6 +1573,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1329,6 +1329,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
index 28146922e3..039e2b0302 100644
--- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
@@ -1,14 +1,14 @@
-From 8f7d065ee71a514eadcefa97e4c02e5f5e92a106 Mon Sep 17 00:00:00 2001
+From f09bdcb55acc96a1cf4000e915a77b81497de271 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 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 9d82a691a..05b17dce7 100644
+index bfbe775fc..41cb8b377 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1475,6 +1475,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1231,6 +1231,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @NotNull
      public String getLocale();
  
diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
index e65bd3e3f2..d0d6665f06 100644
--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From 6db30cd492e9f5db1fcaff253fbe3a4a630af5c6 Mon Sep 17 00:00:00 2001
+From 893176893dceda54d5679ae1c52bddc6e44d2068 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 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 05b17dce7..aa64646aa 100644
+index 41cb8b377..a985431e5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1489,6 +1489,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1245,6 +1245,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index de9a34c5f5..d72c197cc6 100644
--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From fa3de2058c1cd982bb8a88560cd9899823522d6a Mon Sep 17 00:00:00 2001
+From 88db0ef7068bb5d1eb219c6185763ae53da38629 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -68,10 +68,10 @@ index af21bb1aa..b09d01085 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 aa64646aa..0cb6d2b0a 100644
+index a985431e5..dd6adedb6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -442,6 +442,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -441,6 +441,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
index b93a2e3a53..2db752579d 100644
--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From f538375cbfe190146ccf1624387062161c0a1e44 Mon Sep 17 00:00:00 2001
+From 6bac0b2cdf54dd3ded7833db7e3c36904df3e51c Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -384,7 +384,7 @@ index 000000000..4fe18540f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0cb6d2b0a..f0f02c326 100644
+index dd6adedb6..3d07467a4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,6 +1,7 @@
@@ -395,7 +395,7 @@ index 0cb6d2b0a..f0f02c326 100644
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -472,6 +473,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -471,6 +472,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
index ee0ab24d4e..9c5f2ffb01 100644
--- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From d6d84e5ecb5b36e7c4ca106801d0926b72f15244 Mon Sep 17 00:00:00 2001
+From 1f8c16b78f72d2da23b0c5c15886d3f467e1480f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 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 f0f02c326..943e6a64e 100644
+index 3d07467a4..9e62987cb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1225,7 +1225,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -981,7 +981,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @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 f0f02c326..943e6a64e 100644
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1663,6 +1665,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1419,6 +1421,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void openBook(@NotNull ItemStack book);
  
diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
index 51cf791ec7..8607f623e2 100644
--- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
@@ -1,14 +1,14 @@
-From 20f3a9e73351f0d7b3366eab311eb467d1247a25 Mon Sep 17 00:00:00 2001
+From 81e518a15896393670d465674c981237f381c4dc Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 943e6a64e..58a6795df 100644
+index 9e62987cb..6f3ab730b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -444,6 +444,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -443,6 +443,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -35,7 +35,7 @@ index 943e6a64e..58a6795df 100644
      /**
       * Sends the component to the player
       *
-@@ -467,9 +487,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -466,9 +486,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -47,7 +47,7 @@ index 943e6a64e..58a6795df 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1788,9 +1810,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1544,9 +1566,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index 943e6a64e..58a6795df 100644
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1798,9 +1822,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1554,9 +1578,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
index 81aacee050..8b4b87d07b 100644
--- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From 2c5ef53e6bd05c58c28fd9322634a48da97c292a Mon Sep 17 00:00:00 2001
+From 5281507980d4dadb00b963312e8f5056f9671d81 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -86,10 +86,10 @@ index c2096b534..bca9d3659 100644
      <T> void setParticle(@NotNull Particle particle, @Nullable T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 58a6795df..f10ef7ae7 100644
+index 6f3ab730b..cb7d9f055 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -459,7 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -458,7 +458,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -98,7 +98,7 @@ index 58a6795df..f10ef7ae7 100644
       * @param message The message to send
       */
      public void sendActionBar(char alternateChar, @NotNull String message);
-@@ -526,6 +526,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -525,6 +525,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -106,7 +106,7 @@ index 58a6795df..f10ef7ae7 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -534,6 +535,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -533,6 +534,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -114,7 +114,7 @@ index 58a6795df..f10ef7ae7 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -542,6 +544,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -541,6 +543,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -122,7 +122,7 @@ index 58a6795df..f10ef7ae7 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -550,6 +553,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -549,6 +552,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -130,7 +130,7 @@ index 58a6795df..f10ef7ae7 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1442,6 +1446,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1198,6 +1202,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -138,7 +138,7 @@ index 58a6795df..f10ef7ae7 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1458,6 +1463,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1214,6 +1219,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -146,7 +146,7 @@ index 58a6795df..f10ef7ae7 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1508,6 +1514,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1264,6 +1270,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -154,7 +154,7 @@ index 58a6795df..f10ef7ae7 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1528,6 +1535,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1284,6 +1291,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -162,7 +162,7 @@ index 58a6795df..f10ef7ae7 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1584,6 +1592,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1340,6 +1348,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -170,7 +170,7 @@ index 58a6795df..f10ef7ae7 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1606,6 +1615,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1362,6 +1371,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
index 27ae95ced6..a3afc77359 100644
--- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From b59461723c656710c7e6ae295ab42941d8c2e1df Mon Sep 17 00:00:00 2001
+From 0f31dba70d86efcce28be143cd14b9263b250295 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -57,10 +57,10 @@ index 000000000..7b2af1bd7
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f10ef7ae7..a0590f369 100644
+index cb7d9f055..9398f303f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
index 05ab781bb0..44324d1c5f 100644
--- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From d6f2a708c9cb4611c6f9fe506432e7a3968192f1 Mon Sep 17 00:00:00 2001
+From ece58ef4c7915ca83cad87704414c54bf251d3eb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 6 Nov 2017 21:10:01 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -9,10 +9,10 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index ab6750c7a..af4ffada0 100644
+index 8a48572e9..8154093df 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -268,6 +268,16 @@ public interface Block extends Metadatable {
+@@ -269,6 +269,16 @@ public interface Block extends Metadatable {
      @NotNull
      BlockState getState();
  
diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
index d57bd8f942..fa705f70ec 100644
--- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 704a8eb995dad4c5e12beae1782d462c021b1ce9 Mon Sep 17 00:00:00 2001
+From e52b092a351ea904e30208c752ac95425296416c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a0590f369..088430a45 100644
+index 9398f303f..8a67375de 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -934,12 +934,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -690,12 +690,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
index 4ade83e75f..247378b7b5 100644
--- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 401c968c7e87d2d3a91798f153b8d63c1d37d269 Mon Sep 17 00:00:00 2001
+From bde1364a51f6d9157b5f561df604031e8f830cf5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 088430a45..700b8721a 100644
+index 8a67375de..8fe402336 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;
@@ -17,7 +17,7 @@ index 088430a45..700b8721a 100644
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -1772,6 +1773,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1528,6 +1529,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
index c6e00ed8bc..a6dcd8c5fc 100644
--- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From da259346df446940b700aa31114efd056fef37b2 Mon Sep 17 00:00:00 2001
+From eb23471f37a4e9f29ac12f2d92aa64fd30dfa758 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,10 +8,10 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ffc8ad373..222a9a7bf 100644
+index 58313929f..6cf05fed7 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -45,6 +45,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * @return true if banned, otherwise false
       */
      public boolean isBanned();
@@ -74,7 +74,7 @@ index ffc8ad373..222a9a7bf 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 700b8721a..43e191649 100644
+index 8fe402336..c37d7fca0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,10 @@ package org.bukkit.entity;
@@ -88,7 +88,7 @@ index 700b8721a..43e191649 100644
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -445,6 +449,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -444,6 +448,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index f7391226b5..a6e5e64c6e 100644
--- a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -1,4 +1,4 @@
-From 99aa3654f84764dd3c446a154bf4ad6d6f8107e4 Mon Sep 17 00:00:00 2001
+From 47589b69cab026a1e594a7e7ed02c600bee7eb3f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -91,10 +91,10 @@ index 62aa9bd67..64308c1f0 100644
       * Gets the highest non-empty (impassable) coordinate at the given
       * coordinates.
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index af4ffada0..87185a812 100644
+index 8154093df..41f6b8491 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -152,6 +152,72 @@ public interface Block extends Metadatable {
+@@ -153,6 +153,72 @@ public interface Block extends Metadatable {
       */
      int getZ();
  
diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
index b553a3b45e..4f5ae7739d 100644
--- a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From f16a9bfce43f4131c8bdab8db59ca362134fb5b9 Mon Sep 17 00:00:00 2001
+From b319beedc36811afee1dff795c3a29f7644ac8a2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 43e191649..877ea4f32 100644
+index c37d7fca0..3600b4c84 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1947,6 +1947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1703,6 +1703,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull PlayerProfile profile);
diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 3f9b078039..32a01da5a8 100644
--- a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 2aef6859876204c739ce11f7da496d6e80c4ed24 Mon Sep 17 00:00:00 2001
+From d9a50f9d02bba541df351e370d80503db47471d7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Jan 2019 00:31:12 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 222a9a7bf..3ab914fb2 100644
+index 6cf05fed7..3afd5f5c0 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -147,7 +147,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       * UTC.
       *
       * @return Date of last log-in for this player, or 0
@@ -29,12 +29,11 @@ index 222a9a7bf..3ab914fb2 100644
      public long getLastPlayed();
  
      /**
-@@ -165,4 +167,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -165,6 +167,30 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+      */
      @Nullable
      public Location getBedSpawnLocation();
- 
 +    // Paper start
-+
 +    /**
 +     * Gets the last date and time that this player logged into the server.
 +     * <p>
@@ -58,8 +57,9 @@ index 222a9a7bf..3ab914fb2 100644
 +     */
 +    public long getLastSeen();
 +    // Paper end
-+
- }
+ 
+     /**
+      * Increments the given statistic for this player.
 -- 
 2.25.1
 
diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
index b0cfcf11d6..e73e977baa 100644
--- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
+++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
@@ -1,4 +1,4 @@
-From 9e6a8a22c7595adef9fe13fe4849abc0ae937f00 Mon Sep 17 00:00:00 2001
+From 5b993133be600a04fc846882400213a82bec3f84 Mon Sep 17 00:00:00 2001
 From: simpleauthority <[email protected]>
 Date: Tue, 28 May 2019 03:41:28 -0700
 Subject: [PATCH] Add BlockSoundGroup interface
@@ -64,7 +64,7 @@ index 000000000..8cf87d228
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 87185a812..038de5a64 100644
+index 41f6b8491..971386795 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -1,6 +1,7 @@
@@ -75,7 +75,7 @@ index 87185a812..038de5a64 100644
  import org.bukkit.Chunk;
  import org.bukkit.FluidCollisionMode;
  import org.bukkit.Location;
-@@ -527,4 +528,16 @@ public interface Block extends Metadatable {
+@@ -539,4 +540,16 @@ public interface Block extends Metadatable {
       */
      @NotNull
      BoundingBox getBoundingBox();
diff --git a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
index 2e5f934bf5..d8e3bd38fb 100644
--- a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
@@ -1,14 +1,14 @@
-From 160736080a091b569fe39f90e90d3d6b6afdb850 Mon Sep 17 00:00:00 2001
+From 3d916db2d826ce09bda8aaef3dfe9fef5b67f2e6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <[email protected]>
 Date: Thu, 2 Jan 2020 12:25:16 -0600
 Subject: [PATCH] Add effect to block break naturally
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 038de5a64..a14a75834 100644
+index 971386795..19a3b2a1f 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -467,6 +467,18 @@ public interface Block extends Metadatable {
+@@ -468,6 +468,18 @@ public interface Block extends Metadatable {
       */
      boolean breakNaturally(@NotNull ItemStack tool);