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

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 <aikar@aikar.co>
 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.");
          }

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 <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 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();
  

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 <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 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);

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 <zach.brown@destroystokyo.com>
 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);
  

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 <Techcable@outlook.com>
 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);
      }

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 <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 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);
  

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 <aikar@aikar.co>
 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
           *

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 <zach.brown@destroystokyo.com>
 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()}

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 <minecrell@minecrell.net>
 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
   */

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 <aikar@aikar.co>
 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();
  

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 <aikar@aikar.co>
 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();
  

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 <aikar@aikar.co>
 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();

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 <aikar@aikar.co>
 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

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 <Spottedleaf@users.noreply.github.com>
 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();
  

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 <Blake.Galbreath@GMail.com>
 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);

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 <zach@zachbr.io>
 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
 

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 <jacob@algorithmjunkie.com>
 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();

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 <Blake.Galbreath@GMail.com>
 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);
  

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -1,4 +1,4 @@
-From fa6723b00dd09c3e2d8f382abd55578f7a38efd9 Mon Sep 17 00:00:00 2001
+From c9458dab207ad176a4dc2eb7ca23055d54c0b22c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -3151,7 +3151,7 @@ index 7b92ecfff9..7e224ebeff 100644
  
      public static long getTimeMillis() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 177e2af68d..6861711c29 100644
+index 2e1eabba14..2a4fa455ff 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -22,6 +22,7 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@@ -3202,7 +3202,7 @@ index 177e2af68d..6861711c29 100644
      @Override
      public IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag) {
          IChunkAccess ichunkaccess = this.chunkProvider.getChunkAt(i, j, chunkstatus, flag);
-@@ -334,8 +368,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -336,8 +370,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      public void a(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {}
  

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

@@ -1,4 +1,4 @@
-From 146ed9c1216777939f052fb120024009886883e6 Mon Sep 17 00:00:00 2001
+From d399796575a146a7220fa73b00576640faac33df 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
@@ -1090,7 +1090,7 @@ index 2c671629a4..eb3269e0ea 100644
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0694f4563e..1652a57e25 100644
+index 94ed83baf0..f28be11eee 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1183,7 +1183,7 @@ index 820180ab3f..fa6400dccd 100644
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6861711c29..132c08dd19 100644
+index 2a4fa455ff..f572c5f227 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -1221,7 +1221,7 @@ index 6861711c29..132c08dd19 100644
          this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
-@@ -720,15 +722,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -722,15 +724,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -1588,10 +1588,10 @@ index 2bd22a3698..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9eba8449e4..1094190fd9 100644
+index 4fed5dc92f..d7a4e50f23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1753,6 +1753,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1718,6 +1718,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }

Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,4 +1,4 @@
-From 13986de1aeb1d12639e33b794b04416043f82784 Mon Sep 17 00:00:00 2001
+From 3046e2bc8ac417f59ec00f31522e408c5868ea69 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -36,10 +36,10 @@ index 957330b673..7d4badd974 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 4b4e71bf70..cb21ce0b1a 100644
+index 4b4e71bf70..2097ec535e 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -85,6 +85,16 @@ public class EntityFallingBlock extends Entity {
+@@ -85,6 +85,17 @@ public class EntityFallingBlock extends Entity {
              }
  
              this.move(EnumMoveType.SELF, this.getMot());
@@ -51,40 +51,29 @@ index 4b4e71bf70..cb21ce0b1a 100644
 +                }
 +
 +                this.die();
++                return;
 +            }
 +            // Paper end
              if (!this.world.isClientSide) {
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index d042124362..33c51dced7 100644
+index d042124362..d9fd4448c7 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-@@ -54,6 +54,11 @@ public class EntityTNTPrimed extends Entity {
+@@ -54,6 +54,12 @@ public class EntityTNTPrimed extends Entity {
          }
  
          this.move(EnumMoveType.SELF, this.getMot());
 +        // Paper start - Configurable TNT entity height nerf
 +        if (this.world.paperConfig.entityTNTHeightNerf != 0 && this.locY() > this.world.paperConfig.entityTNTHeightNerf) {
 +            this.die();
++            return;
 +        }
 +        // Paper end
          this.setMot(this.getMot().a(0.98D));
          if (this.onGround) {
              this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D));
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1094190fd9..35dbed40df 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -836,7 +836,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void setStatistic(Statistic statistic, EntityType entityType, int newValue) {
--        Validate.notNull(statistic, "Statistic cannot be null");
-+        Validate.notNull(statistic, "TNStatistic cannot be null");
-         Validate.notNull(entityType, "EntityType cannot be null");
-         Validate.isTrue(newValue >= 0, "Value must be greater than or equal to 0");
-         Validate.isTrue(statistic.getType() == Type.ENTITY, "This statistic does not take an EntityType parameter");
 -- 
 2.25.1
 

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

@@ -1,4 +1,4 @@
-From d3732c933f94b0e8ce9b4e46a381652c73e38ef9 Mon Sep 17 00:00:00 2001
+From 8ec886dde0916ea3b979b33030a9c11c152061f4 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
@@ -45,10 +45,10 @@ index 102b3a3c48..08c2a22f7a 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 35dbed40df..f7a4fdb833 100644
+index d7a4e50f23..ae2c1b97ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1661,7 +1661,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1626,7 +1626,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;

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

@@ -1,14 +1,14 @@
-From 36ea04521668f513c7bcaa9d46778668560ecfa4 Mon Sep 17 00:00:00 2001
+From de5359c1296d1a46a5083271f87d5f6771c3c1a3 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 f7a4fdb833..918045408b 100644
+index ae2c1b97ad..b3c8343239 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1350,12 +1350,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1315,12 +1315,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {

Spigot-Server-Patches/0025-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 76803ccabebffd4bd2ddc3856fe8cc053166165e Mon Sep 17 00:00:00 2001
+From 9267e410b3666e372fb8f2a5bb534e903b401c89 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -51,10 +51,10 @@ index 7d4badd974..18236504e4 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index cb21ce0b1a..40fd012ae2 100644
+index 2097ec535e..e64722f63b 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -253,6 +253,14 @@ public class EntityFallingBlock extends Entity {
+@@ -254,6 +254,14 @@ public class EntityFallingBlock extends Entity {
              this.block = Blocks.SAND.getBlockData();
          }
  
@@ -70,10 +70,10 @@ index cb21ce0b1a..40fd012ae2 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 33c51dced7..346315acb7 100644
+index d9fd4448c7..7f8b8f5a36 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-@@ -103,6 +103,14 @@ public class EntityTNTPrimed extends Entity {
+@@ -104,6 +104,14 @@ public class EntityTNTPrimed extends Entity {
      @Override
      protected void a(NBTTagCompound nbttagcompound) {
          this.setFuseTicks(nbttagcompound.getShort("Fuse"));

Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch

@@ -1,4 +1,4 @@
-From 2c9c77a6095c2b24e00ffb34689c49f92551b736 Mon Sep 17 00:00:00 2001
+From db87fa015dcaeff971e40d0a2084b6ee1337afba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -23,10 +23,10 @@ index fa6400dccd..e2f3cec742 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d668759fc..84d7770223 100644
+index 0332aca8be..1bb3620154 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -662,11 +662,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -664,11 +664,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
                          gameprofilerfiller.exit();
                      } catch (Throwable throwable) {
@@ -45,7 +45,7 @@ index 7d668759fc..84d7770223 100644
                      }
                      // Spigot start
                      finally {
-@@ -732,11 +734,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -734,11 +736,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          try {
              consumer.accept(entity);
          } catch (Throwable throwable) {

Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch

@@ -1,14 +1,14 @@
-From a9cda7abf87075eb1ccac611cd60fb52667de7f6 Mon Sep 17 00:00:00 2001
+From c9684d7cf3639906c7f19f842e5c3628f60fdd42 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7c95fd6645..389fadf927 100644
+index 4604634577..4d849719f4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -632,9 +632,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -634,9 +634,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;

Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From ddf72ce7e9f490020d123587c5633f3d362ec3c3 Mon Sep 17 00:00:00 2001
+From 251d521fd5ecdb7dada457fd503bbcebcf6beb32 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -52,7 +52,7 @@ index 3a6e780007..535056c64e 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 918045408b..bbf5a652f3 100644
+index b3c8343239..657fd070b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -62,7 +62,7 @@ index 918045408b..bbf5a652f3 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -211,6 +212,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -210,6 +211,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  

Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From c96869b67ee7a03c144c421cc39e83d5d83a1249 Mon Sep 17 00:00:00 2001
+From a627e87208c266c7d7ce88b57e0e1647fa3f07a0 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -30,10 +30,10 @@ index cd47a4ca06..abbf59bb91 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bbf5a652f3..658854dc93 100644
+index 657fd070b9..2d6550efb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -760,7 +760,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {

Spigot-Server-Patches/0054-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From edd30270fe295be3faac2fe37d6c08d4ddd94c0f Mon Sep 17 00:00:00 2001
+From 6a954ca055a4da758ea6442c0717d9b26fbf4776 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -209,7 +209,7 @@ index d5e9bae709..1bcf01c09a 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 74be3e40d1..6e68c013a4 100644
+index 6e8ac186c9..a6b2867094 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,9 @@ package net.minecraft.server;
@@ -222,7 +222,7 @@ index 74be3e40d1..6e68c013a4 100644
  import com.google.common.collect.Lists;
  import java.io.IOException;
  import java.util.Collection;
-@@ -662,8 +665,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -664,8 +667,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                          gameprofilerfiller.exit();
                      } catch (Throwable throwable) {
                          // Paper start - Prevent tile entity and entity crashes
@@ -235,7 +235,7 @@ index 74be3e40d1..6e68c013a4 100644
                          tilesThisCycle--;
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
-@@ -734,8 +740,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -736,8 +742,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              consumer.accept(entity);
          } catch (Throwable throwable) {
              // Paper start - Prevent tile entity and entity crashes

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

@@ -1,4 +1,4 @@
-From ff2417af80fc45e18e0b8d628b5c69ec088425e1 Mon Sep 17 00:00:00 2001
+From dec6bca4f8b0a134ac14184f999e4408e6931528 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
@@ -22,10 +22,10 @@ index 5e8739462e..3c8c9c9cd4 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 658854dc93..2cdea9f5d0 100644
+index 2d6550efb8..f2d820c399 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -134,6 +134,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -133,6 +133,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double health = 20;
      private boolean scaledHealth = false;
      private double healthScale = 20;
@@ -36,7 +36,7 @@ index 658854dc93..2cdea9f5d0 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1765,6 +1769,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1730,6 +1734,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }

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

@@ -1,4 +1,4 @@
-From 769a0228d72e5f65cdca22bc8b1eb8290804d9a8 Mon Sep 17 00:00:00 2001
+From ed7477bde4156d57b763baa9c44bb186c4555f49 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
@@ -44,10 +44,10 @@ index 1eca778d31..08d0728e16 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2cdea9f5d0..8688b727a3 100644
+index f2d820c399..f6b8bb6c7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1584,6 +1584,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1549,6 +1549,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {

Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch

@@ -1,4 +1,4 @@
-From 105d542538802f184f616b4b5de2737a2e365b94 Mon Sep 17 00:00:00 2001
+From 0283d4c14d3f32472d0471735d3751061ca70090 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
@@ -44,10 +44,10 @@ index 3d580a666b..3094f763ba 100644
                  this.methodProfiler.a(() -> {
                      return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 502da7f52d..83f9ea88f3 100644
+index 6b1ff8f64f..1edd030865 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -367,7 +367,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -369,7 +369,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.b(this, blockposition, j); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((WorldServer) this).getWorld();
@@ -56,7 +56,7 @@ index 502da7f52d..83f9ea88f3 100644
                      BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
                      this.getServer().getPluginManager().callEvent(event);
  
-@@ -479,7 +479,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -481,7 +481,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              try {
                  // CraftBukkit start
                  CraftWorld world = ((WorldServer) this).getWorld();

Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -1,14 +1,14 @@
-From 0925ac03e9d71b629cd48ff9aad501291c0540e8 Mon Sep 17 00:00:00 2001
+From 6a762fb7eb1144330bf2119ab4fe3c837ffaa7c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 83f9ea88f3..9672248c7c 100644
+index 1edd030865..aaedbaf4d7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -437,6 +437,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -439,6 +439,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public void b(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {}
  
      public void applyPhysics(BlockPosition blockposition, Block block) {

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

@@ -1,4 +1,4 @@
-From d637263813198dc061262a0312b5042cf47e4f1c Mon Sep 17 00:00:00 2001
+From 181ed0136ad9f2f861bb4dbc53cba79e5c9f4acf 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 8688b727a3..5647eb135e 100644
+index f6b8bb6c7a..f668d86a9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -769,6 +769,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -768,6 +768,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  

Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From 19acaef36982407bd7db3af13755691bbdff1bc2 Mon Sep 17 00:00:00 2001
+From c41934486e47af3dfd38d9b7e06122f7ffb4ff0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9672248c7c..1dccc2e0dd 100644
+index aaedbaf4d7..0e8d31babd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -36,7 +36,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -18,7 +18,7 @@ index 9672248c7c..1dccc2e0dd 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      protected final List<TileEntity> tileEntityListPending = Lists.newArrayList();
      protected final java.util.Set<TileEntity> tileEntityListUnload = com.google.common.collect.Sets.newHashSet();
-@@ -602,9 +602,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -604,9 +604,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                      }, tileentity::getPosition});
          }
  
@@ -30,7 +30,7 @@ index 9672248c7c..1dccc2e0dd 100644
              this.tileEntityListTick.add(tileentity);
          }
  
-@@ -640,7 +640,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -642,7 +642,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          timings.tileEntityTick.startTiming(); // Spigot
          if (!this.tileEntityListUnload.isEmpty()) {
              this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -39,7 +39,7 @@ index 9672248c7c..1dccc2e0dd 100644
              this.tileEntityListUnload.clear();
          }
  
-@@ -701,7 +701,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -703,7 +703,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
                  // Spigot end
@@ -48,7 +48,7 @@ index 9672248c7c..1dccc2e0dd 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).removeTileEntity(tileentity.getPosition());
                  }
-@@ -731,7 +731,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -733,7 +733,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                          this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
                          // CraftBukkit start
                          // From above, don't screw this up - SPIGOT-1746
@@ -57,7 +57,7 @@ index 9672248c7c..1dccc2e0dd 100644
                              this.a(tileentity1);
                          }
                          // CraftBukkit end
-@@ -997,7 +997,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -999,7 +999,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          } else {
              if (tileentity != null) {
                  this.tileEntityListPending.remove(tileentity);

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

@@ -1,4 +1,4 @@
-From ad04c3909a4d9d77aa6f5d0e9865168591ea8fdf Mon Sep 17 00:00:00 2001
+From 7e305871b49b3145c819e600bc8f87c84f261389 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
@@ -40,10 +40,10 @@ index b5101af011..d4bba876d0 100644
          this.ci = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5647eb135e..447ecf636d 100644
+index f668d86a9c..060a21840f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1768,8 +1768,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1733,8 +1733,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -56,7 +56,7 @@ index 5647eb135e..447ecf636d 100644
      }
  
      // Paper start
-@@ -1856,7 +1858,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1821,7 +1823,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              }
          }
  

Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,4 +1,4 @@
-From 4d627b0070525fda368462b3f7d05db763e3dbb3 Mon Sep 17 00:00:00 2001
+From 91a6440e61188de08b45839276fe2fc71c774cb9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
@@ -49,10 +49,10 @@ index 4fd0e54de7..7e552f985a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 346315acb7..d3b2075f25 100644
+index 7f8b8f5a36..9c31edade2 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-@@ -79,7 +79,27 @@ public class EntityTNTPrimed extends Entity {
+@@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity {
                  this.world.addParticle(Particles.SMOKE, this.locX(), this.locY() + 0.5D, this.locZ(), 0.0D, 0.0D, 0.0D);
              }
          }
@@ -81,7 +81,7 @@ index 346315acb7..d3b2075f25 100644
      }
  
      private void explode() {
-@@ -148,4 +168,11 @@ public class EntityTNTPrimed extends Entity {
+@@ -149,4 +169,11 @@ public class EntityTNTPrimed extends Entity {
      public Packet<?> L() {
          return new PacketPlayOutSpawnEntity(this);
      }

Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch

@@ -1,4 +1,4 @@
-From 0c71c68c3c5dfa4c5d521196eff2be2940eba0aa Mon Sep 17 00:00:00 2001
+From d88ab15995a757498456e1495ab3dc8dd8591256 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
@@ -30,10 +30,10 @@ index 721eceeffc..bff2e9d26d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 40fd012ae2..798942a2b4 100644
+index e64722f63b..6683f7c5f3 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -232,6 +232,15 @@ public class EntityFallingBlock extends Entity {
+@@ -233,6 +233,15 @@ public class EntityFallingBlock extends Entity {
      @Override
      protected void a(NBTTagCompound nbttagcompound) {
          this.block = GameProfileSerializer.d(nbttagcompound.getCompound("BlockState"));

Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch

@@ -1,4 +1,4 @@
-From bf29f85184a1f798675d861e1d01fec7fa424428 Mon Sep 17 00:00:00 2001
+From 52daecb04e84accf7785b87a427e7ddeefffb3ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@@ -42,10 +42,10 @@ index de2bc8f6a6..e42dc05504 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 447ecf636d..3a2a886180 100644
+index 060a21840f..d1745c4e93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -217,6 +217,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start

Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch

@@ -1,4 +1,4 @@
-From ffc841cf1a9d42a53445f81cc495107844cc5ba5 Mon Sep 17 00:00:00 2001
+From 1e1eb3eebc71ab596ea7e07962d7088fe9a00bb4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
@@ -58,10 +58,10 @@ index 5e92f0ddb4..3bd5ddba68 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 66cd2db1ea..a1397d1427 100644
+index 77ee3c293c..ce84885af6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -513,6 +513,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          getHandle().getCooldownTracker().setCooldown(CraftMagicNumbers.getItem(material), ticks);
      }
  

Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch

@@ -1,14 +1,14 @@
-From 9623869646171a8fa71018ddff5408b23c798906 Mon Sep 17 00:00:00 2001
+From 529e676c1d75d76e73012bc1d0fd5bcd8e42c499 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ff14c265b1..bfb682ebbd 100644
+index 9632839598..14c97a163c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -645,7 +645,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -647,7 +647,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          gameprofilerfiller.enter("blockEntities");
          timings.tileEntityTick.startTiming(); // Spigot
          if (!this.tileEntityListUnload.isEmpty()) {

Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From 357e241e7a83d0a0c6ed04ae4859587066247d30 Mon Sep 17 00:00:00 2001
+From bb5e450c8154a82323f388c18893110db3d8d1cf Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -111,10 +111,10 @@ index 4f008e4723..8545146fb1 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3a2a886180..5b5f2418eb 100644
+index d1745c4e93..129aefd5e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -184,6 +184,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -183,6 +183,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  

Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch

@@ -1,4 +1,4 @@
-From c02f4c3f44c8762e99eeb084c806c16f2910c5fe Mon Sep 17 00:00:00 2001
+From 3525cf56eab8d92724da5d7edea7a0419569fab1 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -72,10 +72,10 @@ index 3bd5ddba68..c86d22e7ae 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bfb682ebbd..6c3cd19be1 100644
+index 14c97a163c..a956dbc3d4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -582,6 +582,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -584,6 +584,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.playSound(entityhuman, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, soundeffect, soundcategory, f, f1);
      }
  

Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch

@@ -1,4 +1,4 @@
-From a1c2dd16c28bafd489c044b329e83f9165d3e597 Mon Sep 17 00:00:00 2001
+From acb4e329c24a42d0fa90ca0f05b0a24e885c97c5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6c3cd19be1..f349c7fe2e 100644
+index a956dbc3d4..2f57c7bc76 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -39,16 +39,16 @@ index 6c3cd19be1..f349c7fe2e 100644
              if (blockstate == null) {
                  blockstate = CapturedBlockState.getTreeBlockState(this, blockposition, i);
                  this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate);
-@@ -276,7 +276,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -277,7 +277,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
- 
              // CraftBukkit start - capture blockstates
+             boolean captured = false;
              if (this.captureBlockStates && !this.capturedBlockStates.containsKey(blockposition)) {
 -                CapturedBlockState blockstate = CapturedBlockState.getBlockState(this, blockposition, i);
 +                CraftBlockState blockstate = (CraftBlockState) world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getState(); // Paper - use CB getState to get a suitable snapshot
                  this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate);
+                 captured = true;
              }
-             // CraftBukkit end
+@@ -545,7 +545,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-@@ -543,7 +543,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public IBlockData getType(BlockPosition blockposition) {
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {

Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From 8ef55353c0d875913003f0b76b3350e403464c99 Mon Sep 17 00:00:00 2001
+From a14f5b0c6cc0718f0811156f67ed304439a657cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -39,10 +39,10 @@ index 630b279158..958279249f 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index c0f557568d..fa840c3d38 100644
+index eb0201ebe1..1354d949c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -309,6 +309,20 @@ public class CraftBlock implements Block {
+@@ -311,6 +311,20 @@ public class CraftBlock implements Block {
  
      @Override
      public BlockState getState() {

Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From 11fd8feec557b491e9eb6bdf03b4ab3edd2119e7 Mon Sep 17 00:00:00 2001
+From 2ddd8eb72ea47d200d3dbd78ecae35a33a76de34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -43,10 +43,10 @@ index b3edb69a96..87c6b77ce3 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5b5f2418eb..6f47768c9d 100644
+index 129aefd5e8..6d46fa23d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1053,8 +1053,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1018,8 +1018,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
      }
  

Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 0a0f2bf32d1fa7ecc2d633a436998cf6209c901f Mon Sep 17 00:00:00 2001
+From cb49deb9821891dc3560fac122eed7e326d890b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -48,7 +48,7 @@ index 1b43f92164..1c4ac7bf7a 100644
                              uniqueId = i.getId();
                              // 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 6f47768c9d..15e33d7627 100644
+index 6d46fa23d2..ef7fff7545 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -60,7 +60,7 @@ index 6f47768c9d..15e33d7627 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -1211,8 +1213,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1176,8 +1178,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
  
          // Remove this player from the hidden player's EntityTrackerEntry
@@ -75,7 +75,7 @@ index 6f47768c9d..15e33d7627 100644
          PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
          if (entry != null) {
              entry.clear(getHandle());
-@@ -1253,8 +1260,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1218,8 +1225,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          hiddenPlayers.remove(player.getUniqueId());
  
@@ -90,7 +90,7 @@ index 6f47768c9d..15e33d7627 100644
  
          getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
  
-@@ -1263,6 +1275,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1228,6 +1240,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entry.updatePlayer(getHandle());
          }
      }

Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch

@@ -1,4 +1,4 @@
-From 7dd957d03a19a278b167889c04cbc3b96edf4807 Mon Sep 17 00:00:00 2001
+From e179bc675da1cafd87c51d57de4472ffd4cd46b6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 15e33d7627..52640237ae 100644
+index ef7fff7545..25c80a40d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
@@ -20,7 +20,7 @@ index 15e33d7627..52640237ae 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1480,7 +1481,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1445,7 +1446,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {

Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch

@@ -1,14 +1,14 @@
-From 1386fb4e37a89df468e11ec20b796101c237b085 Mon Sep 17 00:00:00 2001
+From d40c57ab4c44bad10a22d537758c9d4f432b44e9 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a1397d1427..cd8ad27047 100644
+index ce84885af6..d5f5550350 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -764,4 +764,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -612,4 +612,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
              entity.remove();
          }
      }

Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From b00e40aeb2f62d8c8b83276a2e6224b1daff4cf5 Mon Sep 17 00:00:00 2001
+From 71e4e853de74df2ea993a4ff280d857578435133 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -101,7 +101,7 @@ index 4a0a847944..8eb12e89ea 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 002f7e844a..fd0f5c6f29 100644
+index f863ab7426..442673b13f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {
@@ -136,10 +136,10 @@ index da391e945c..c5b4218b44 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cd8ad27047..e169679c88 100644
+index d5f5550350..1c88eacea9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -467,8 +467,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
  
      @Override
      public void closeInventory() {
@@ -155,10 +155,10 @@ index cd8ad27047..e169679c88 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 52640237ae..d7d86a8b24 100644
+index 25c80a40d8..91ad5776c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -786,7 +786,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -785,7 +785,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (getHandle().activeContainer != getHandle().defaultContainer) {

Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -1,4 +1,4 @@
-From b8661c328a854699d61a50a31d7cca9c6b46f680 Mon Sep 17 00:00:00 2001
+From 63dd01cefe3869a13f0bd4947ffd314561a75551 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -19,10 +19,10 @@ index 387e0dcb9f..eaaa51e4bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cab9ec5dd4..749915198b 100644
+index a1c33c525c..2261c42ab6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -779,6 +779,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -781,6 +781,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  

Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,4 +1,4 @@
-From 6a81dc0fc0d954e1d084457b95c240e00e2dad04 Mon Sep 17 00:00:00 2001
+From d3f0982c20b5697f277e68580cd3425cd0752636 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
@@ -27,10 +27,10 @@ index 36748ccb73..308ac18f7e 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d7d86a8b24..d584c76ecd 100644
+index 91ad5776c8..c7bd3015a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1940,6 +1940,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1905,6 +1905,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          getInventory().setItemInMainHand(hand);
      }
  

Spigot-Server-Patches/0292-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 78532959f99d1addbae3326a50a0db8f333e989f Mon Sep 17 00:00:00 2001
+From ca7b8f78b8472dfa962351fd96f0265b5a49746b Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -357,10 +357,10 @@ index 90fdf89c81..b761a41dcd 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d584c76ecd..878287cf0d 100644
+index c7bd3015a8..823dba0143 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1733,7 +1733,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1698,7 +1698,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {

Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From d024b4e040e8600d2ba1c38dc0ba06bea9272734 Mon Sep 17 00:00:00 2001
+From b4f055c1105153cdc03fa5f44c502994f252f4d3 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -1127,10 +1127,10 @@ index 5bf2fc0b3f..52a4982ecd 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1905aae877..f54743a910 100644
+index 378ac5ae86..f861957842 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -520,6 +520,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -522,6 +522,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      }
  
@@ -1138,7 +1138,7 @@ index 1905aae877..f54743a910 100644
      public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
          if (!this.isClientSide) {
              IBlockData iblockdata = this.getType(blockposition);
-@@ -1275,6 +1276,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1277,6 +1278,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
      }
  

Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch

@@ -1,4 +1,4 @@
-From e46e47cca906d804941139efa76bada8d5520a4d Mon Sep 17 00:00:00 2001
+From 484723eb66e15561e7b4ff672d91d24758e48aea Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@@ -8,10 +8,10 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 6a448c02ec..c1ef1c950d 100644
+index 58e10381c8..0e8a21b803 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin;
+@@ -29,12 +29,12 @@ import org.bukkit.plugin.Plugin;
  public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializable {
      private final GameProfile profile;
      private final CraftServer server;
@@ -26,7 +26,7 @@ index 6a448c02ec..c1ef1c950d 100644
  
      }
  
-@@ -177,8 +177,23 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -181,8 +181,23 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
          return hash;
      }
  
@@ -51,7 +51,7 @@ index 6a448c02ec..c1ef1c950d 100644
      }
  
      private NBTTagCompound getBukkitData() {
-@@ -195,7 +210,7 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -199,7 +214,7 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
      }
  
      private File getDataFile() {

Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -1,4 +1,4 @@
-From d14e80a658660914866df1ffc0fb822377a0c469 Mon Sep 17 00:00:00 2001
+From c928eba40d86d3ade8444532b94e47808fe56775 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -28,7 +28,7 @@ index 35ea476014..4cff86b9a5 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e46436623c..659ce21818 100644
+index 36d31d271c..4d6ac8f85c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,10 +40,10 @@ index e46436623c..659ce21818 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950d..3824180ee5 100644
+index 0e8a21b803..32e02af96e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -260,6 +260,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
          return getData() != null;
      }
  
@@ -106,10 +106,10 @@ index c1ef1c950d..3824180ee5 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 878287cf0d..2de233df35 100644
+index 823dba0143..21aaacc13d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -140,6 +140,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@@ -117,7 +117,7 @@ index 878287cf0d..2de233df35 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1384,6 +1385,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1349,6 +1350,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index 878287cf0d..2de233df35 100644
      public void readExtraData(NBTTagCompound nbttagcompound) {
          hasPlayedBefore = true;
          if (nbttagcompound.hasKey("bukkit")) {
-@@ -1406,6 +1419,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1371,6 +1384,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(NBTTagCompound nbttagcompound) {
@@ -145,7 +145,7 @@ index 878287cf0d..2de233df35 100644
          if (!nbttagcompound.hasKey("bukkit")) {
              nbttagcompound.set("bukkit", new NBTTagCompound());
          }
-@@ -1420,6 +1435,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1385,6 +1400,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.setLong("firstPlayed", getFirstPlayed());
          data.setLong("lastPlayed", System.currentTimeMillis());
          data.setString("lastKnownName", handle.getName());

Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch

@@ -1,4 +1,4 @@
-From 43396bf6e30641ec40dc9be1f6b7cd817b3783f3 Mon Sep 17 00:00:00 2001
+From 27539df92037f2eecee6e1d40e45bace83eb5c6c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2de233df35..74a9e8f22e 100644
+index 21aaacc13d..344e9e9b48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1985,6 +1985,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1950,6 +1950,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetCooldown();
      }

Spigot-Server-Patches/0344-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From 4136cfa283d5cb6840b17d4dcdc2c1b5c8ee0012 Mon Sep 17 00:00:00 2001
+From b96a59506a52801bea29becdcc56226ec18af104 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,10 +11,10 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f54743a910..67a088f19a 100644
+index f861957842..a3fbdf5db5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -450,8 +450,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -452,8 +452,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              return false;
          } else {
              Fluid fluid = this.getFluid(blockposition);

Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch

@@ -1,4 +1,4 @@
-From c81d94f3096231156a7dd06eb86bc98791400537 Mon Sep 17 00:00:00 2001
+From 841b144f150fe75079d02574ac325f788a9e5850 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 67a088f19a..4aca398f10 100644
+index a3fbdf5db5..f797d737a3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -996,12 +996,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -998,12 +998,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              return null;
          } else {
              // CraftBukkit start

Spigot-Server-Patches/0365-Add-Heightmap-API.patch

@@ -1,14 +1,14 @@
-From 96e7b7431ce369a046487a5dfa4514621b9163e9 Mon Sep 17 00:00:00 2001
+From 7e86e575ff29520947a3189b43852d7a9992c07f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4aca398f10..20d9dd839c 100644
+index f797d737a3..983bc1c7d9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -571,8 +571,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -573,8 +573,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  

Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch

@@ -1,4 +1,4 @@
-From 021f9b1885929435158ce0f1d1f5bc586f2c0c45 Mon Sep 17 00:00:00 2001
+From 2a81df36a55f67d76e13b88d85dc3797549dbd45 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
@@ -39,10 +39,10 @@ index 2e95069c19..8977c3516b 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 74a9e8f22e..60f62f19cb 100644
+index 344e9e9b48..33cac5fcb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1994,6 +1994,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1959,6 +1959,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              super.remove();
          }
      }

Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch

@@ -1,4 +1,4 @@
-From 0ccc24ded3499d4bdeddc7436596bc68a639446f Mon Sep 17 00:00:00 2001
+From 37d8141044995e54c81c0a78e57fe42706d5a56d Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
@@ -96,10 +96,10 @@ index b774d2d8d9..0184bf3fc9 100644
          return this.D;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index fa840c3d38..a667e58ed2 100644
+index 1354d949c1..aae818674f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -697,4 +697,11 @@ public class CraftBlock implements Block {
+@@ -704,4 +704,11 @@ public class CraftBlock implements Block {
          AxisAlignedBB aabb = shape.getBoundingBox();
          return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
      }

Spigot-Server-Patches/0386-Anti-Xray.patch

@@ -1,4 +1,4 @@
-From 395f055ec8659f673f6ac2c2f77e117c03b7f987 Mon Sep 17 00:00:00 2001
+From 6191ccae334276d01e31aa639fc754b25854c7ba Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -1181,7 +1181,7 @@ index 0000000000..37093419cf
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4d300699f1..06b4dc6284 100644
+index 1709f9b842..b6ba0cb79e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -320,7 +320,7 @@ public class Chunk implements IChunkAccess {
@@ -1558,7 +1558,7 @@ index 027a6b0fd2..50135446f7 100644
                  this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false);
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 02ed8c6c4c..7dec34cb76 100644
+index 5ac370720c..b4c9d544fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1648,7 +1648,7 @@ index f82db93f88..1d1b267f32 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 18e0ca2c78..75829b4de5 100644
+index 8cf3c10274..0bde171743 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -1676,14 +1676,14 @@ index 18e0ca2c78..75829b4de5 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
-@@ -340,6 +344,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -342,6 +346,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              // CraftBukkit end
  
              IBlockData iblockdata1 = chunk.setType(blockposition, iblockdata, (i & 64) != 0, (i & 1024) == 0); // CraftBukkit custom NO_PLACE flag
 +            this.chunkPacketBlockController.onBlockChange(this, blockposition, iblockdata, iblockdata1, i); // Paper - Anti-Xray
  
              if (iblockdata1 == null) {
-                 // CraftBukkit start - remove blockstate if failed
+                 // CraftBukkit start - remove blockstate if failed (or the same)
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 index 8191e7c348..969d548de2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java

Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch

@@ -1,4 +1,4 @@
-From 02df6715408780bb9eac36e0bddbc2ef96130626 Mon Sep 17 00:00:00 2001
+From 08aa512a01483a552bb3d8eb61e5c8dd1a2277d0 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
@@ -21,7 +21,7 @@ index 691331217b..f88bcb29db 100644
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 75829b4de5..61829b3bf9 100644
+index 0bde171743..90f60dfd47 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -116,8 +116,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -42,7 +42,7 @@ index 75829b4de5..61829b3bf9 100644
  
      protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
-@@ -1107,14 +1115,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1109,14 +1117,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
  
      public boolean n(BlockPosition blockposition) {

Spigot-Server-Patches/0394-Reduce-sync-loads.patch

@@ -1,4 +1,4 @@
-From 8b1900b6e3b872b5d0b8c83827515de8756e930a Mon Sep 17 00:00:00 2001
+From f51f7c9e3c06a2a82d79d3f62367bcc61c9929b5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
@@ -280,10 +280,10 @@ index 03d7ce8294..eb4bc66bce 100644
              this.serverThreadQueue.awaitTasks(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 61829b3bf9..1cbd50450d 100644
+index 90f60dfd47..48c75af827 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1171,7 +1171,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1173,7 +1173,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 <= j; ++i1) {
              for (int j1 = k; j1 <= l; ++j1) {
@@ -292,7 +292,7 @@ index 61829b3bf9..1cbd50450d 100644
  
                  if (chunk != null) {
                      chunk.a(entity, axisalignedbb, list, predicate);
-@@ -1192,7 +1192,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1194,7 +1194,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
@@ -301,7 +301,7 @@ index 61829b3bf9..1cbd50450d 100644
  
                  if (chunk != null) {
                      chunk.a(entitytypes, axisalignedbb, list, predicate);
-@@ -1215,7 +1215,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1217,7 +1217,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {

Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch

@@ -1,14 +1,14 @@
-From d23d177b6d56f8fc94b703c67a64df7ee1774f9f Mon Sep 17 00:00:00 2001
+From 35a827f49ab54b6a22b3962455cce40b3e58bbc6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 12:25:07 -0600
 Subject: [PATCH] Add effect to block break naturally
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index a667e58ed2..78e84c3d6d 100644
+index aae818674f..a25d9d7aa1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -607,12 +607,20 @@ public class CraftBlock implements Block {
+@@ -609,12 +609,20 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean breakNaturally(ItemStack item) {

Spigot-Server-Patches/0431-Seed-based-feature-search.patch

@@ -1,4 +1,4 @@
-From b7a1e0ede8a8ad47748a9b64280e27c2a5974315 Mon Sep 17 00:00:00 2001
+From fdb38218344d17d0c1e95241e8cda505fcdc9b39 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Mon, 13 Jan 2020 15:40:32 +0100
 Subject: [PATCH] Seed based feature search
@@ -94,10 +94,10 @@ index e8ce2ecf23..acfe732af5 100644
  
      public abstract StructureGenerator.a a();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1cbd50450d..803fe43be1 100644
+index 48c75af827..79d8c7ba31 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1561,8 +1561,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1563,8 +1563,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return this.methodProfiler;
      }
  

Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch

@@ -1,4 +1,4 @@
-From 9b356605eb26690183b2c23e5ac090da4b4bd366 Mon Sep 17 00:00:00 2001
+From a9e20c5c7a618f765b43d7ce1358544b702855f5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 27 Jan 2020 21:28:00 -0800
 Subject: [PATCH] Optimise random block ticking
@@ -395,10 +395,10 @@ index de43881653..e821c236b4 100644
  
      public final SoundEffectType getStepSound() { return this.r(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 601a68ad60..bb34486a36 100644
+index 28b6c9a083..d554d4cf0f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1555,10 +1555,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1557,10 +1557,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public abstract TagRegistry t();
  
      public BlockPosition a(int i, int j, int k, int l) {

Spigot-Server-Patches/0440-Make-the-GUI-graph-fancier.patch

@@ -1,4 +1,4 @@
-From 2947dc9359349c1a842e3d3d60c97cdeaf0a78f7 Mon Sep 17 00:00:00 2001
+From ce778d326095785bae1ad18ad9ac142b89dd5fe5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 2 Feb 2020 04:00:40 -0600
 Subject: [PATCH] Make the GUI graph fancier

Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch

@@ -1,32 +0,0 @@
-From 348184180d29734db3274dd6de280a3f9faaf6a7 Mon Sep 17 00:00:00 2001
-From: Trigary <trigary0@gmail.com>
-Date: Mon, 17 Feb 2020 22:53:33 +0100
-Subject: [PATCH] fix blockstate capture undoing
-
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bb34486a36..5117dafbcf 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -353,7 +353,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-             Block block = iblockdata.getBlock();
- 
-             // CraftBukkit start - capture blockstates
-+            boolean capturedBlockState = false; //Paper - fix blockstate capture undoing
-             if (this.captureBlockStates && !this.capturedBlockStates.containsKey(blockposition)) {
-+                capturedBlockState = true; //Paper - fix blockstate capture undoing
-                 CraftBlockState blockstate = (CraftBlockState) world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getState(); // Paper - use CB getState to get a suitable snapshot
-                 this.capturedBlockStates.put(blockposition.immutableCopy(), blockstate);
-             }
-@@ -364,7 +366,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
- 
-             if (iblockdata1 == null) {
-                 // CraftBukkit start - remove blockstate if failed
--                if (this.captureBlockStates) {
-+                if (/*this.captureBlockStates*/ capturedBlockState) { //Paper - fix blockstate capture undoing
-                     this.capturedBlockStates.remove(blockposition);
-                 }
-                 // CraftBukkit end
--- 
-2.25.1
-

Spigot-Server-Patches/0441-Backport-fix-for-MC-167561.patch

@@ -1,4 +1,4 @@
-From d2a4a2789cf86d69b3b1242ce8dc256a31361614 Mon Sep 17 00:00:00 2001
+From a771840c788dc386f8900388be089f64ee09d3bc Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Feb 2020 18:44:28 +0000
 Subject: [PATCH] Backport fix for MC-167561

Spigot-Server-Patches/0442-add-hand-to-BlockMultiPlaceEvent.patch

@@ -1,4 +1,4 @@
-From a844bc20fa2bff923b9d372a2abbced2684d14fb Mon Sep 17 00:00:00 2001
+From 966fe904a22a7edc74dd42abe7df98b6c7cfdbb6 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Sun, 1 Mar 2020 22:43:24 +0100
 Subject: [PATCH] add hand to BlockMultiPlaceEvent

Spigot-Server-Patches/0443-Prevent-teleporting-dead-entities.patch

@@ -1,4 +1,4 @@
-From 425da92c8488b5a9f29b7ce249f012fe162ca632 Mon Sep 17 00:00:00 2001
+From 0657657d8c6bb67a9a79759b6ebe159bd5dd1f1b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 3 Mar 2020 05:26:40 +0000
 Subject: [PATCH] Prevent teleporting dead entities

Spigot-Server-Patches/0444-Validate-tripwire-hook-placement-before-update.patch

@@ -1,4 +1,4 @@
-From 91f9f9b14d1899439adeb620a72ba6448d24ac0a Mon Sep 17 00:00:00 2001
+From 3ac27f90c6ee5434144f901658f139553b1e7e9e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 7 Mar 2020 00:07:51 +0000
 Subject: [PATCH] Validate tripwire hook placement before update

Spigot-Server-Patches/0445-Add-option-to-allow-iron-golems-to-spawn-in-air.patch

@@ -1,4 +1,4 @@
-From 7ed9b5ad6d03a910e2db85a6cf1c189eb4d4842d Mon Sep 17 00:00:00 2001
+From 118cf30d531fda11fe6f0aaf2216398db423c722 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Apr 2019 16:50:58 -0500
 Subject: [PATCH] Add option to allow iron golems to spawn in air

Spigot-Server-Patches/0446-Configurable-chance-of-villager-zombie-infection.patch

@@ -1,4 +1,4 @@
-From 75d1c989942511f365c2ac9b700ea844efa7b305 Mon Sep 17 00:00:00 2001
+From 3d37a5266fe83310993240e1f562b6d3fc9eece2 Mon Sep 17 00:00:00 2001
 From: Zero <zero@cock.li>
 Date: Sat, 22 Feb 2020 16:10:31 -0500
 Subject: [PATCH] Configurable chance of villager zombie infection

Spigot-Server-Patches/0447-Optimise-Chunk-getFluid.patch

@@ -1,4 +1,4 @@
-From 6a3222e17e9760e6855494c35c51986eb2e673a7 Mon Sep 17 00:00:00 2001
+From a6af38e8706ccaf50b12123df1681533fa07c20e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 14:59:08 -0800
 Subject: [PATCH] Optimise Chunk#getFluid
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 92065fe029..07073af991 100644
+index 971c0315d5..2b0e431874 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -297,17 +297,20 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0448-Optimise-TickListServer-by-rewriting-it.patch

@@ -1,4 +1,4 @@
-From 82c4577d793be0bb53553d966fcf7b2f385bee7e Mon Sep 17 00:00:00 2001
+From beac857bf39ee6363dd4dfe1a1f5445acadb8fb9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 14 Feb 2020 01:24:39 -0800
 Subject: [PATCH] Optimise TickListServer by rewriting it

Spigot-Server-Patches/0449-Reduce-entity-tracker-updates-on-move.patch

@@ -1,4 +1,4 @@
-From 28eb2f0c96f7d0f91d35ef6d102b7e36640a006d Mon Sep 17 00:00:00 2001
+From 60f5236d5a6774790e2fa2ff30d2d5b848d5b98d Mon Sep 17 00:00:00 2001
 From: froobynooby <froobynooby@froobworld.com>
 Date: Thu, 20 Feb 2020 15:50:49 +0930
 Subject: [PATCH] Reduce entity tracker updates on move
@@ -69,7 +69,7 @@ index e7bfbc3307..43774bc9a5 100644
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 09440fffb5..9f0b0b4270 100644
+index f564502f81..0186ab9e40 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -133,6 +133,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0450-Pillager-patrol-spawn-settings-and-per-player-option.patch

@@ -1,4 +1,4 @@
-From 9b9f9f9e7d0b036b1dc3e1801287c1dbb594bfc6 Mon Sep 17 00:00:00 2001
+From 86f414d0e872878eb09a240b516ccf652040d8d7 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 1 Feb 2020 16:50:39 +0100
 Subject: [PATCH] Pillager patrol spawn settings and per player options

Spigot-Server-Patches/0451-Ensure-Entity-is-never-double-registered.patch

@@ -1,4 +1,4 @@
-From 7fd1e9d995e0e1dd71008037e7008ae9951bbd14 Mon Sep 17 00:00:00 2001
+From 76dfeec0aa423c46709031d9cf9b2985d4fe5cd8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Mar 2020 18:26:14 -0400
 Subject: [PATCH] Ensure Entity is never double registered
@@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state.
 We will now simply log a warning when this happens instead of crashing the server.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c4879ac569..d098b224fb 100644
+index 3d1d93a8b4..862a64b6fd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0452-Fix-unregistering-entities-from-unloading-chunks.patch

@@ -1,4 +1,4 @@
-From cbf316e677e64ca1dbea8c01d6af80ef4f9124d2 Mon Sep 17 00:00:00 2001
+From 55a0a2dd95e11c1f38c0399c0b02d0acb32acfb4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:01:45 -0400
 Subject: [PATCH] Fix unregistering entities from unloading chunks

Spigot-Server-Patches/0453-Remote-Connections-shouldn-t-hold-up-shutdown.patch

@@ -1,4 +1,4 @@
-From e7dcbbb87ef8c0eb23dbd1d3c537c05e36249c73 Mon Sep 17 00:00:00 2001
+From b1bbdd9a261ca276de15ee8394e26188066934f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:50:42 -0400
 Subject: [PATCH] Remote Connections shouldn't hold up shutdown

Spigot-Server-Patches/0454-Do-not-allow-bees-to-load-chunks-for-beehives.patch

@@ -1,4 +1,4 @@
-From 99ebcb2c4e88996aeba62c0c99ca126585afb046 Mon Sep 17 00:00:00 2001
+From 5a1b4b784b89d2420f6d8a1b45e1748c800974fb Mon Sep 17 00:00:00 2001
 From: chickeneer <Paperchickeneer@gmail.com>
 Date: Tue, 17 Mar 2020 14:18:50 -0500
 Subject: [PATCH] Do not allow bees to load chunks for beehives

Spigot-Server-Patches/0455-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch

@@ -1,4 +1,4 @@
-From 2b4960bfbfb550be563d687efdee50352e72387d Mon Sep 17 00:00:00 2001
+From 962e7da640e2e9a75a8c83908019edddcae3829b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 01:42:39 -0400
 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9f0b0b4270..bfa62e13e9 100644
+index 0186ab9e40..e1e4ea793a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1484,6 +1484,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0456-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch

@@ -1,4 +1,4 @@
-From 65b130822bef9a7dccd6477643a412f99cfa6aad Mon Sep 17 00:00:00 2001
+From f6d2192e47570cffa14bbbdab869f0b5b6b64480 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 02:37:57 -0400
 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks

Spigot-Server-Patches/0457-Don-t-tick-dead-players.patch

@@ -1,4 +1,4 @@
-From 5b6fe0786932553967b817376dc54594178a5977 Mon Sep 17 00:00:00 2001
+From d2462ffcb109088a92453395be60af2f8d1bc0b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 17:16:48 -0400
 Subject: [PATCH] Don't tick dead players

Spigot-Server-Patches/0458-Dead-Player-s-shouldn-t-be-able-to-move.patch

@@ -1,4 +1,4 @@
-From 9cdecab5498cede81fe5cbc9be88a071bf5844f7 Mon Sep 17 00:00:00 2001
+From abbbd696fcbb14464f8b2b29c3050377e9c7e313 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 19:31:16 -0400
 Subject: [PATCH] Dead Player's shouldn't be able to move

Spigot-Server-Patches/0459-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch

@@ -1,4 +1,4 @@
-From 38cb54b87993ec1a444f34f2b7f84eac40ef06e0 Mon Sep 17 00:00:00 2001
+From d4a80e85b8785b079769629ecf004f73fde66efd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 03:06:30 -0400
 Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks

work/Bukkit

@@ -1 +1 @@
-Subproject commit 122289ff79122a372e95aabf8e4e79736be725a7
+Subproject commit 7361a62ec7fd9e572d727caebd9ac47e1bd69990

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit bbe3d58efc489ce7905d4334dba82426e36610b8
+Subproject commit f7d6ad53eeb1ad3a4372cc73fe77eac4e01a9470