Update upstream B/CB

--- work/Bukkit
Submodule work/Bukkit 6a4242cb..337955e3:
  > SPIGOT-5468: Improve Beehive TileEntity API
  > #473: Add an API for passing the heightmap to getHighestBlockAt* method

--- work/CraftBukkit
Submodule work/CraftBukkit 807a677e..708be695:
  > SPIGOT-5468: Improve Beehive TileEntity API
  > #624: Add an API for passing the heightmap to getHighestBlockAt* method
  > MC-135989, SPIGOT-5564: Don't kick players for flight while riptiding

This deprecates the Paper getHighestBlockAt HeightMap APIs now that
Bukkit has added their own. These methods will stick around long enough
for people to migrate. Their API is pretty much the same as ours,
migration should be quick and easy.

Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From 5d94f183e60047f21dfef16d2c9fe8a2b8155a46 Mon Sep 17 00:00:00 2001
+From f59dbb5b5ae31181c9724d9ed31160fd81126570 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index edd73f41..220420ed 100644
+index 709f3999..da9f234d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1859,6 +1859,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1910,6 +1910,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -17,7 +17,7 @@ index edd73f41..220420ed 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1875,6 +1876,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1926,6 +1927,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -25,7 +25,7 @@ index edd73f41..220420ed 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1925,6 +1927,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1976,6 +1978,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -33,7 +33,7 @@ index edd73f41..220420ed 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1945,6 +1948,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1996,6 +1999,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @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()}
@@ -41,7 +41,7 @@ index edd73f41..220420ed 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);
  
-@@ -2001,6 +2005,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2052,6 +2056,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -49,7 +49,7 @@ index edd73f41..220420ed 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -2023,6 +2028,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2074,6 +2079,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -57,7 +57,7 @@ index edd73f41..220420ed 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -2046,6 +2052,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2097,6 +2103,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -65,7 +65,7 @@ index edd73f41..220420ed 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
  
-@@ -2071,6 +2078,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2122,6 +2129,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -86,7 +86,7 @@ index c2096b53..bca9d365 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 85a5637f..da36c8df 100644
+index 58a6795d..f10ef7ae 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
@@ -192,5 +192,5 @@ index 1b2267f4..1a58734d 100644
          return to;
      }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch

@@ -1,4 +1,4 @@
-From a63e50797c651f9140ab1e0e9fa7a928649d5eab Mon Sep 17 00:00:00 2001
+From 256e2482d181da8a5050ddf7145d181663db2639 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 220420ed..bd050368 100644
+index da9f234d..ab2ddc05 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
@@ -19,7 +19,7 @@ index 220420ed..bd050368 100644
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
-@@ -583,6 +586,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -634,6 +637,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
  
@@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644
       */
      public void setPlayerProfile(@NotNull PlayerProfile profile) {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 17e492080ad5240dbe98e9983b1ae2b96979ad0d Mon Sep 17 00:00:00 2001
+From 2ca6fb7ec06fa0341101144a5f314075154d200b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -515,10 +515,10 @@ index 49467ac7..d2ceb07c 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index bd050368..0b357583 100644
+index ab2ddc05..54d86a76 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2283,7 +2283,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2334,7 +2334,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */
@@ -578,5 +578,5 @@ index bd050368..0b357583 100644
      /**
       * Spawns the particle (the number of times specified by count)
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0112-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From f8cc53df49e56becb4f871f8205b35b5a2abdd2e Mon Sep 17 00:00:00 2001
+From 77d3bbb15dfa39739fa8a5712b848bd45fe042c6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -106,10 +106,10 @@ index 4cf22afc..ac3c8eef 100644
       * Returns a list of entities within a bounding box centered around a Location.
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0b357583..b257eda2 100644
+index 54d86a76..86d488e5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1302,6 +1302,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1353,6 +1353,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
  
@@ -199,5 +199,5 @@ index 0b357583..b257eda2 100644
       * Creates explosion at given coordinates with given power and optionally
       * setting blocks on fire or breaking blocks.
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch

@@ -1,14 +1,14 @@
-From d7084ea0a2a44fed946a7b95cb34a48803b39312 Mon Sep 17 00:00:00 2001
+From ea50ead30623af4d40088561beb454adef129629 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b257eda2..260ee11a 100644
+index 86d488e5..f82063af 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -862,6 +862,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -913,6 +913,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Collection<Entity> getNearbyEntities(@NotNull Location location, double x, double y, double z);
  
@@ -27,5 +27,5 @@ index b257eda2..260ee11a 100644
       * Returns a list of entities within a bounding box centered around a
       * Location.
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -1,4 +1,4 @@
-From b20a912f73626ff663ee63c603cef6b7bd38a601 Mon Sep 17 00:00:00 2001
+From 95f8aab973c23ae9661bd35f135f30589ab91a88 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -44,10 +44,10 @@ index 95e485ee..0bbef14a 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 260ee11a..abd469b5 100644
+index f82063af..ae414b51 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -155,6 +155,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -206,6 +206,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Chunk getChunkAt(@NotNull Block block);
  
@@ -71,5 +71,5 @@ index 260ee11a..abd469b5 100644
       * Checks if the specified {@link Chunk} is loaded
       *
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0133-Async-Chunks-API.patch

@@ -1,4 +1,4 @@
-From b58f65b305f5d0822f5802442a400a92f1ef7504 Mon Sep 17 00:00:00 2001
+From 3392ff505d528572bbfe41cecebb034b2ae07cb4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index abd469b5..310041ae 100644
+index ae414b51..a62663b2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -169,6 +169,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -220,6 +220,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
      public default Chunk getChunkAt(long chunkKey) {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
@@ -371,7 +371,7 @@ index abd469b5..310041ae 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 04365232..83e02aea 100644
+index b4069dbf..45e0dffe 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -406,5 +406,5 @@ index 04365232..83e02aea 100644
       * Returns a list of entities within a bounding box centered around this
       * entity
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0139-isChunkGenerated-API.patch

@@ -1,4 +1,4 @@
-From 6d81881cbf9b5eca26d514dd5397735659b33f18 Mon Sep 17 00:00:00 2001
+From 6a29ae93dfaeecf54eb718c7a35fdbfb1008e72e Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
@@ -34,10 +34,10 @@ index 07e532cd..6e1a1124 100644
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5bf2ba6f..c6e2efc3 100644
+index e291c544..5366d205 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -202,6 +202,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -253,6 +253,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
  
@@ -56,5 +56,5 @@ index 5bf2ba6f..c6e2efc3 100644
       * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
       * as well as future support
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0158-Add-sun-related-API.patch

@@ -1,14 +1,14 @@
-From f8fa7eb584dab2c32c88b92bbedc705f6540581c Mon Sep 17 00:00:00 2001
+From 192bb200ebeadeabe5d775797a033c15cbb63a82 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c6e2efc3..23c76976 100644
+index 5366d205..d0256af5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1594,6 +1594,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1645,6 +1645,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public void setFullTime(long time);
  
@@ -44,5 +44,5 @@ index afdc103f..784db447 100644
  
      /**
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0181-Add-Heightmap-API.patch

@@ -1,23 +1,28 @@
-From 0de142a12fee06c6dd294d94bbb6351bb727c4f4 Mon Sep 17 00:00:00 2001
+From bdfb8acea9f01a1fcceca8598a330c073777ac3e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Dec 2018 19:00:36 -0800
 Subject: [PATCH] Add Heightmap API
 
+Deprecated 2020-02-08 MC 1.15.2
 
 diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java
 new file mode 100644
-index 00000000..4cd9b5ed
+index 00000000..709e44ea
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,39 @@
 +package com.destroystokyo.paper;
 +
-+import org.bukkit.World;
++import org.bukkit.*;
 +
 +/**
 + * Enumeration of different heightmap types maintained by the server. Generally using these maps is much faster
 + * than using an iterative search for a block in a given x, z coordinate.
++ *
++ * @deprecated Upstream has added their own API for using the game heightmaps. See {@link org.bukkit.HeightMap} and the
++ * non-deprecated getHighestBlock methods on World such as {@link org.bukkit.World#getHighestBlockAt(Location, HeightMap)}.
 + */
++@Deprecated
 +public enum HeightmapType {
 +
 +    /**
@@ -84,10 +89,10 @@ index 77d9cd0a..59047503 100644
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 23c76976..b46b2719 100644
+index d0256af5..5047be15 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -159,6 +159,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -159,6 +159,87 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Block getHighestBlockAt(@NotNull Location location);
  
@@ -104,9 +109,11 @@ index 23c76976..b46b2719 100644
 +     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
 +     * @return The highest block's y-coordinate at (x, z) that matches the specified heightmap's conditions.
 +     * @throws UnsupportedOperationException If the heightmap type is not supported.
++     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockYAt(int, int, HeightMap)}
 +     *
 +     * @see com.destroystokyo.paper.HeightmapType
 +     */
++    @Deprecated
 +    public int getHighestBlockYAt(int x, int z, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException;
 +
 +    /**
@@ -121,8 +128,10 @@ index 23c76976..b46b2719 100644
 +     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
 +     * @return The highest block's y-coordinate at {@code location} that matches the specified heightmap's conditions.
 +     * @throws UnsupportedOperationException If the heightmap type is not supported.
++     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockYAt(Location, HeightMap)}
 +     * @see com.destroystokyo.paper.HeightmapType
 +     */
++    @Deprecated
 +    default int getHighestBlockYAt(@NotNull Location location, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
 +        return this.getHighestBlockYAt(location.getBlockX(), location.getBlockZ(), heightmap);
 +    }
@@ -138,8 +147,10 @@ index 23c76976..b46b2719 100644
 +     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
 +     * @return The highest {@link Block} at (x, z) that matches the specified heightmap's conditions.
 +     * @throws UnsupportedOperationException If the heightmap type is not supported.
++     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockAt(int, int, HeightMap)}
 +     * @see com.destroystokyo.paper.HeightmapType
 +     */
++    @Deprecated
 +    @NotNull
 +    default Block getHighestBlockAt(int x, int z, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
 +        return this.getBlockAt(x, this.getHighestBlockYAt(x, z, heightmap), z);
@@ -156,8 +167,10 @@ index 23c76976..b46b2719 100644
 +     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
 +     * @return The highest {@link Block} at {@code location} that matches the specified heightmap's conditions.
 +     * @throws UnsupportedOperationException If the heightmap type is not supported.
++     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockAt(Location, HeightMap)}
 +     * @see com.destroystokyo.paper.HeightmapType
 +     */
++    @Deprecated
 +    @NotNull
 +    default Block getHighestBlockAt(@NotNull Location location, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
 +        return this.getHighestBlockAt(location.getBlockX(), location.getBlockZ(), heightmap);
@@ -165,8 +178,8 @@ index 23c76976..b46b2719 100644
 +    // Paper end
 +
      /**
-      * Gets the {@link Chunk} at the given coordinates
+      * Gets the highest coordinate corresponding to the {@link HeightMap} at the
-      *
+      * given coordinates.
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,4 +1,4 @@
-From 7ebe7afb5067c436e7e9bc2b5b21c90729204fbe Mon Sep 17 00:00:00 2001
+From 3fd06184c267fa162162c17e6e763702234ed2eb 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
@@ -1027,7 +1027,7 @@ index 93d838ec2..2a6955f85 100644
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b257e1c4e..b7beb058d 100644
+index 6a681d694..914366afc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1054,7 +1054,7 @@ index b257e1c4e..b7beb058d 100644
  
      }
  
-@@ -1638,7 +1637,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1639,7 +1638,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -1063,7 +1063,7 @@ index b257e1c4e..b7beb058d 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1649,7 +1648,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1650,7 +1649,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1072,7 +1072,7 @@ index b257e1c4e..b7beb058d 100644
              return;
          }
  
-@@ -1662,7 +1661,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1663,7 +1662,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {

Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From 635ddb856eddff4a429c4583f3f3b49b37043342 Mon Sep 17 00:00:00 2001
+From f5b16a53f760891bfab7e4951725a6fff547c044 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b7beb058d..fae57fc2c 100644
+index 914366afc..5e8739462 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1569,6 +1569,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1570,6 +1570,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (!async && s.startsWith("/")) {

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

@@ -1,14 +1,14 @@
-From 9a79f4087ddad325e6977edaff1534ba034fc8da Mon Sep 17 00:00:00 2001
+From 7dae55fc2612508d4644257ecd7605bec633e679 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fae57fc2c..d90c6a732 100644
+index 5e8739462..3c8c9c9cd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1334,7 +1334,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1335,7 +1335,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -70,5 +70,5 @@ index 658854dc9..2cdea9f5d 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 8911d5abc6989c9bd7ef6f59ed6dd5ecce082a72 Mon Sep 17 00:00:00 2001
+From 087616ee503fcb696a72c674f4b06b6dcc0984ee Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index 680adbdeb..3f7697b39 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d90c6a732..f91144693 100644
+index 3c8c9c9cd..505189c82 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1911,6 +1911,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1912,6 +1912,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
              }
          }
@@ -39,5 +39,5 @@ index d90c6a732..f91144693 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From caaba70e8e56d2d3fcfb0ffb4eb88b3a9dcde929 Mon Sep 17 00:00:00 2001
+From 1d29077967f0ec4dc5840ab8f2b420029bde1c9f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -26,10 +26,10 @@ index 47f5f8055..b1d1a3c1f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f91144693..8f182fcc8 100644
+index 505189c82..669d9a41d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1647,7 +1647,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1648,7 +1648,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      return;
                  }
  
@@ -61,5 +61,5 @@ index 05ea0ace5..94a24a49c 100644
          playerconnection.a(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.yaw, entityplayer.pitch);
          this.players.add(entityplayer);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch

@@ -1,4 +1,4 @@
-From 82df99d1570b1ea9b89a46e9f3817a764418c61d Mon Sep 17 00:00:00 2001
+From 7d11d4b8e961bcb5790099363cc49ff58708e277 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,10 +23,10 @@ index 53f96a157..010b17d2e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 53d201c59..77cfec712 100644
+index 7476f07aa..f057ebda8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1203,13 +1203,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
@@ -44,5 +44,5 @@ index 53d201c59..77cfec712 100644
              limitedPackets = 0;
              return true;
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch

@@ -1,4 +1,4 @@
-From e0662983efb699fc39eef3764e2dbb9ba07f1811 Mon Sep 17 00:00:00 2001
+From 414cee6eee5fd0b0c91db8027459118baca2fb65 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d3bdec7995..1296eb04f0 100644
+index d3bdec799..1296eb04f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1800,7 +1800,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index d3bdec7995..1296eb04f0 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 16b70221ea..cc6a2aaeb3 100644
+index 5b304c04b..f367a76e8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2525,7 +2525,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2526,7 +2526,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      public final boolean isDisconnected() {
@@ -32,5 +32,5 @@ index 16b70221ea..cc6a2aaeb3 100644
      // CraftBukkit end
  
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,4 +1,4 @@
-From 15d40ccec1d004a3184d64acede40edc0f971e18 Mon Sep 17 00:00:00 2001
+From 5400af4052dd232cf9e2be9e1a6d73f9db1de5f9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2c0a426a5..ec7396f2a 100644
+index 5b03ff709..a41b32ddc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -275,6 +275,48 @@ public class CraftWorld implements World {
+@@ -274,6 +274,48 @@ public class CraftWorld implements World {
      private int waterAnimalSpawn = -1;
      private int ambientSpawn = -1;
  
@@ -60,5 +60,5 @@ index 2c0a426a5..ec7396f2a 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From 692d000b1596c8b2c341fd1c76d8ab8216f224c5 Mon Sep 17 00:00:00 2001
+From dfa14f50d01094fce3527e2051c95b49c3f7bf40 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -265,10 +265,10 @@ index 8dc47452a..560e2f42b 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ddc029706..5d8c3e2a3 100644
+index a41b32ddc..462458645 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1772,7 +1772,7 @@ public class CraftWorld implements World {
+@@ -1791,7 +1791,7 @@ public class CraftWorld implements World {
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
              entity = new EntityTNTPrimed(world, x, y, z, null);
          } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {

Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -1,4 +1,4 @@
-From 67f44d3e0ef99546dfe06d45068101403a7ebaaf Mon Sep 17 00:00:00 2001
+From 02c2cd67ab3608d5d46fdd7168b306f80a48f4da Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -26,7 +26,7 @@ index 751551f17..eae1690cc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2a54723a6..6c9c0f2b7 100644
+index b407d80ae..5e92f0ddb 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,10 +39,10 @@ index 2a54723a6..6c9c0f2b7 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc6a2aaeb..01ab2e151 100644
+index f367a76e8..046ef418f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1772,6 +1772,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
          switch (packetplayinentityaction.c()) {
              case PRESS_SHIFT_KEY:
                  this.player.setSneaking(true);
@@ -57,5 +57,5 @@ index cc6a2aaeb..01ab2e151 100644
              case RELEASE_SHIFT_KEY:
                  this.player.setSneaking(false);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch

@@ -1,4 +1,4 @@
-From 056ed0a9981963afaea02490a6e4cafec63a6ef5 Mon Sep 17 00:00:00 2001
+From e5944274798212c32b8562cd16a803d101f13e2f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 399724d6a..a4660f2b8 100644
+index b0651dcfb..d4a649a83 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2486,14 +2486,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2487,14 +2487,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -40,5 +40,5 @@ index 399724d6a..a4660f2b8 100644
  
      }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch

@@ -1,14 +1,14 @@
-From a03d0fda0fd2195c8c2b50b96ce17a9bce897080 Mon Sep 17 00:00:00 2001
+From cf29ee10de10c640a74260790a682363e672714c Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ad2a36627..8757b6751 100644
+index 64f789d7c..4a0a84794 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2501,7 +2501,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
@@ -18,5 +18,5 @@ index ad2a36627..8757b6751 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From fbaa35c2118e603786789780c0f8b94796c695ad Mon Sep 17 00:00:00 2001
+From 4d9578d880588210f742ed2f3fe7a4e0ca0c920b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -43,10 +43,10 @@ index bcb1c924b..c773314cf 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5d8c3e2a3..723f612bd 100644
+index 462458645..451cc0c2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2242,11 +2242,17 @@ public class CraftWorld implements World {
+@@ -2261,11 +2261,17 @@ public class CraftWorld implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {

Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch

@@ -1,4 +1,4 @@
-From b2c1cbfbadc277ba21c8afdf648bc233a9ba673c Mon Sep 17 00:00:00 2001
+From ada5d8374f14438decfc9e9f9802bf64677b354b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 723f612bd..e8fd9c398 100644
+index 451cc0c2d..aefa7bb18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1464,6 +1464,10 @@ public class CraftWorld implements World {
+@@ -1483,6 +1483,10 @@ public class CraftWorld implements World {
          if (Boat.class.isAssignableFrom(clazz)) {
              entity = new EntityBoat(world, x, y, z);
              entity.setPositionRotation(x, y, z, yaw, pitch);

Spigot-Server-Patches/0237-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From 92776b1fcffce76718e405e0f3fbf485e0281ffa Mon Sep 17 00:00:00 2001
+From 993655ee16a3acee6e738dda4c754537d2b1c680 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e8fd9c398..598cdb026 100644
+index aefa7bb18..a58337be3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -873,6 +873,11 @@ public class CraftWorld implements World {
+@@ -871,6 +871,11 @@ public class CraftWorld implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
          return !world.createExplosion(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
      }

Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch

@@ -1,14 +1,14 @@
-From 53d24aab9341c308605ef9b9e31980c4e1fdad05 Mon Sep 17 00:00:00 2001
+From 35945816d00a9dff5cedd0f1d8c4b0cb946a0409 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 598cdb026..7d62d0f22 100644
+index a58337be3..f957d4272 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1266,6 +1266,15 @@ public class CraftWorld implements World {
+@@ -1285,6 +1285,15 @@ public class CraftWorld implements World {
          return list;
      }
  

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

@@ -1,4 +1,4 @@
-From 4b7038782910fbfc830ff3d0b058230fb2a3908a Mon Sep 17 00:00:00 2001
+From abf6cb2c774d700e46442b8db37af7fcda2800ef 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
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4721c288ba..36748ccb73 100644
+index 4721c288b..36748ccb7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 4721c288ba..36748ccb73 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1296eb04f0..a9a16eace9 100644
+index 1296eb04f..a9a16eace 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -366,7 +366,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,10 +88,10 @@ index 1296eb04f0..a9a16eace9 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8757b6751e..4f04410f9b 100644
+index 4a0a84794..8eb12e89e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
@@ -101,7 +101,7 @@ index 8757b6751e..4f04410f9b 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 002f7e844..fd0f5c6f2 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 {
@@ -114,7 +114,7 @@ index 002f7e844a..fd0f5c6f29 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 62a16173b9..f0c912be43 100644
+index c773314cf..bad4e6f7f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1047,7 +1047,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 62a16173b9..f0c912be43 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 cd8ad2704..e169679c8 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 {
@@ -155,7 +155,7 @@ 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 f4affa693a..c1f3927164 100644
+index f4affa693..c1f392716 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 {
@@ -168,7 +168,7 @@ index f4affa693a..c1f3927164 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index caf277439a..f931fa48b4 100644
+index caf277439..f931fa48b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1293,8 +1293,19 @@ public class CraftEventFactory {
@@ -193,5 +193,5 @@ index caf277439a..f931fa48b4 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch

@@ -1,4 +1,4 @@
-From d82f7d4350a122be3d5f77d8cdeae7adcc174c96 Mon Sep 17 00:00:00 2001
+From 3326c5867df77d3d6ae7ee79d33b2ad7b3ebd72a Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4f04410f9..3a7e197e3 100644
+index 8eb12e89e..8648845ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1949,6 +1949,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1950,6 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
  
                      if (event.isCancelled()) {
@@ -28,5 +28,5 @@ index 4f04410f9..3a7e197e3 100644
                      }
                      // CraftBukkit end
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch

@@ -1,4 +1,4 @@
-From 1248e08f7683a7b20a0e3d9334752e534779738a Mon Sep 17 00:00:00 2001
+From e8d0b2c90a6e8abd3404c38ca5b18e28e531c73e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -92,10 +92,10 @@ index 70e4b58a9..54505e056 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7d62d0f22..d348b461d 100644
+index f957d4272..a6a273c31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1002,6 +1002,7 @@ public class CraftWorld implements World {
+@@ -1021,6 +1021,7 @@ public class CraftWorld implements World {
          for (Object o : world.entitiesById.values()) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -103,7 +103,7 @@ index 7d62d0f22..d348b461d 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -1021,6 +1022,7 @@ public class CraftWorld implements World {
+@@ -1040,6 +1041,7 @@ public class CraftWorld implements World {
          for (Object o : world.entitiesById.values()) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -111,7 +111,7 @@ index 7d62d0f22..d348b461d 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -1047,6 +1049,7 @@ public class CraftWorld implements World {
+@@ -1066,6 +1068,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entitiesById.values()) {
              if (entity instanceof net.minecraft.server.Entity) {
@@ -119,7 +119,7 @@ index 7d62d0f22..d348b461d 100644
                  Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
  
                  if (bukkitEntity == null) {
-@@ -1070,6 +1073,7 @@ public class CraftWorld implements World {
+@@ -1089,6 +1092,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entitiesById.values()) {
              if (entity instanceof net.minecraft.server.Entity) {

Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch

@@ -1,4 +1,4 @@
-From ef56be27551db764d9774704d2eb0ff56ba80255 Mon Sep 17 00:00:00 2001
+From 263663ffc1af517587f7619b6c6f05906fdcbb25 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@@ -68,10 +68,10 @@ index 54505e056..a411a23de 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d348b461d..aa2c275f3 100644
+index a6a273c31..2b82a9438 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2077,7 +2077,7 @@ public class CraftWorld implements World {
+@@ -2096,7 +2096,7 @@ public class CraftWorld implements World {
          double z = loc.getZ();
  
          PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);

Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch

@@ -1,4 +1,4 @@
-From 0a511bd84b2749e1b0efcf1260d4ce5ff6dabe0b Mon Sep 17 00:00:00 2001
+From a8a52313ee7e3bdb0a7b6f512c7fd9ef8d4d7327 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index aa2c275f3..393c91d36 100644
+index 2b82a9438..ce1ac730c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -497,7 +497,7 @@ public class CraftWorld implements World {
+@@ -495,7 +495,7 @@ public class CraftWorld implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot

Spigot-Server-Patches/0311-Add-sun-related-API.patch

@@ -1,4 +1,4 @@
-From bd411a13ef15369d88689e204a0bbc72fae0c88d Mon Sep 17 00:00:00 2001
+From 42ceb23b06ae943b7d805b09972ad86870e6f159 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
@@ -17,10 +17,10 @@ index 5ca281172..e259c868e 100644
          if (this.world.isDay() && !this.world.isClientSide) {
              float f = this.aI();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 393c91d36..e92566696 100644
+index ce1ac730c..323d78b22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -854,6 +854,13 @@ public class CraftWorld implements World {
+@@ -852,6 +852,13 @@ public class CraftWorld implements World {
          }
      }
  

Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -1,14 +1,14 @@
-From 90b8fb0a67bd69a8677cf253dcc0cd212f557e04 Mon Sep 17 00:00:00 2001
+From 36762affd06ca9e30d8f94f1d18cd066ca36f1bf Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ccad0a601..d263897da 100644
+index bde60377e..b21fca9e5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1271,6 +1271,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1272,6 +1272,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
              case START_DESTROY_BLOCK:
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
@@ -21,5 +21,5 @@ index ccad0a601..d263897da 100644
                  return;
              default:
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch

@@ -1,4 +1,4 @@
-From 164f75b7e4bfa6d170ddd9edf90976c63c53361a Mon Sep 17 00:00:00 2001
+From 1905f86c9162ccd1280286a679e3bf6ef72f59f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c3feccbd6..c54e1c9a0 100644
+index 4b3ddfd99..2c94ca6a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2545,7 +2545,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2546,7 +2546,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  
@@ -43,5 +43,5 @@ index 4c2273497..f051f2d3c 100644
  
      public EntityHuman f() {
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch

@@ -1,4 +1,4 @@
-From 86fc828d1d7846a9bca09301fbb2941d2efcac1d Mon Sep 17 00:00:00 2001
+From bbd5e016b89420f8e365f75a0ce7a1d083333c95 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c54e1c9a0..bd2ee459f 100644
+index 2c94ca6a8..94d3d602c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -33,7 +33,7 @@ index c54e1c9a0..bd2ee459f 100644
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
-@@ -2561,6 +2562,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2562,6 +2563,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
@@ -50,5 +50,5 @@ index c54e1c9a0..bd2ee459f 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch

@@ -1,4 +1,4 @@
-From e3bfdacc716c82d0a1086bf16a16f511b7b1f116 Mon Sep 17 00:00:00 2001
+From 7f1f0a3fd0c347eabb6f3dfbb56b47b98e4932ba Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
@@ -22,10 +22,10 @@ index 3ff7a7b4a..3a88c9a67 100644
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bd2ee459f..17eeecaf4 100644
+index 94d3d602c..eee96c3a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2005,7 +2005,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2006,7 +2006,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                      if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
                          // Refresh the current entity metadata
@@ -35,5 +35,5 @@ index bd2ee459f..17eeecaf4 100644
  
                      if (event.isCancelled()) {
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,4 +1,4 @@
-From c2974ae8735072bfab8a59203b89a130cb47643b Mon Sep 17 00:00:00 2001
+From 845e98cc02f7ce3a77ee8bddce44efc8d8392946 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
@@ -20,11 +20,11 @@ index b506f5871..406e5c60a 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e92566696..c0fc11857 100644
+index 323d78b22..27602824a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -337,6 +337,29 @@ public class CraftWorld implements World {
+@@ -335,6 +335,29 @@ public class CraftWorld implements World {
-         return world.getChunkAt(x >> 4, z >> 4).a(HeightMap.Type.MOTION_BLOCKING, x, z);
+         return getHighestBlockYAt(x, z, org.bukkit.HeightMap.MOTION_BLOCKING);
      }
  
 +    // Paper start - Implement heightmap api
@@ -37,13 +37,13 @@ index e92566696..c0fc11857 100644
 +                throw new UnsupportedOperationException(); // TODO
 +                //return this.world.getHighestBlockY(HeightMap.Type.LIGHT_BLOCKING, x, z);
 +            case ANY:
-+                return this.world.getHighestBlockY(HeightMap.Type.WORLD_SURFACE, x, z);
++                return this.world.getHighestBlockY(net.minecraft.server.HeightMap.Type.WORLD_SURFACE, x, z);
 +            case SOLID:
-+                return this.world.getHighestBlockY(HeightMap.Type.OCEAN_FLOOR, x, z);
++                return this.world.getHighestBlockY(net.minecraft.server.HeightMap.Type.OCEAN_FLOOR, x, z);
 +            case SOLID_OR_LIQUID:
-+                return this.world.getHighestBlockY(HeightMap.Type.MOTION_BLOCKING, x, z);
++                return this.world.getHighestBlockY(net.minecraft.server.HeightMap.Type.MOTION_BLOCKING, x, z);
 +            case SOLID_OR_LIQUID_NO_LEAVES:
-+                return this.world.getHighestBlockY(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, x, z);
++                return this.world.getHighestBlockY(net.minecraft.server.HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, x, z);
 +            default:
 +                throw new UnsupportedOperationException();
 +        }

Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch

@@ -1,4 +1,4 @@
-From 7c8f0017f280584daf2d3b07d8136eb9e73e0384 Mon Sep 17 00:00:00 2001
+From 4ace85f30e1af1167db76e5f203eaecc17b49350 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
@@ -9,10 +9,10 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c0fc11857..a81b8e8da 100644
+index 27602824a..4fae7c849 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -401,14 +401,13 @@ public class CraftWorld implements World {
+@@ -399,14 +399,13 @@ public class CraftWorld implements World {
  
      @Override
      public boolean isChunkLoaded(int x, int z) {

Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 1fff504acc6d15cb0106aca97129d857103b13f6 Mon Sep 17 00:00:00 2001
+From ca95036219225fc356b6b5b0c090fb71e6c29745 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -207,10 +207,10 @@ index c969e9090..5f9930447 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a81b8e8da..c33f6dfef 100644
+index 4fae7c849..67d51eeba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1905,15 +1905,21 @@ public class CraftWorld implements World {
+@@ -1924,15 +1924,21 @@ public class CraftWorld implements World {
  
      @Override
      public void setKeepSpawnInMemory(boolean keepLoaded) {

Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch

@@ -1,4 +1,4 @@
-From f77fe7c2a15b64060343f638aa5008a7de40829a Mon Sep 17 00:00:00 2001
+From f3e3ec09e2c0a8d1405e754d9fe3c1605b825a5d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls
@@ -280,7 +280,7 @@ index b3d1bb5fd..e07ae9854 100644
              throwable = throwable1;
              throw throwable1;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c33f6dfef..6db69e929 100644
+index 67d51eeba..6204a2207 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -18,6 +18,7 @@ import java.util.Objects;
@@ -291,7 +291,7 @@ index c33f6dfef..6db69e929 100644
  import java.util.function.Predicate;
  import java.util.stream.Collectors;
  import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-@@ -406,8 +407,22 @@ public class CraftWorld implements World {
+@@ -404,8 +405,22 @@ public class CraftWorld implements World {
  
      @Override
      public boolean isChunkGenerated(int x, int z) {
@@ -315,7 +315,7 @@ index c33f6dfef..6db69e929 100644
          } catch (IOException ex) {
              throw new RuntimeException(ex);
          }
-@@ -519,20 +534,49 @@ public class CraftWorld implements World {
+@@ -517,20 +532,49 @@ public class CraftWorld implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot

Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch

@@ -1,4 +1,4 @@
-From db08b1825d6c8831239c84cda4f8890ff47b0ac2 Mon Sep 17 00:00:00 2001
+From 35d80611a44aaf1afc693eb1aedab1c1a50e5ef2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -4026,10 +4026,10 @@ index 27dcc2528..6506daeec 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6db69e929..5291b5144 100644
+index 6204a2207..95a29d1b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -552,22 +552,23 @@ public class CraftWorld implements World {
+@@ -550,22 +550,23 @@ public class CraftWorld implements World {
                  return true;
              }
  
@@ -4061,7 +4061,7 @@ index 6db69e929..5291b5144 100644
  
              // fall through to load
              // we do this so we do not re-read the chunk data on disk
-@@ -2387,6 +2388,25 @@ public class CraftWorld implements World {
+@@ -2406,6 +2407,25 @@ public class CraftWorld implements World {
          return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
      }
  

Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch

@@ -1,4 +1,4 @@
-From 416122939f23e6c4ed30a9ad4ddd395b2e265dcb Mon Sep 17 00:00:00 2001
+From 51e677c767f7aa6d4ac700ab6e5ecb92b8b82d37 Mon Sep 17 00:00:00 2001
 From: MisterErwin <git@askarian.net>
 Date: Wed, 30 Oct 2019 16:57:54 +0100
 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5291b5144..7b89ccbe7 100644
+index 95a29d1b2..a14b8cb98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1823,7 +1823,12 @@ public class CraftWorld implements World {
+@@ -1842,7 +1842,12 @@ public class CraftWorld implements World {
                  height = 9;
              }
  

Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch

@@ -1,4 +1,4 @@
-From 67f7f66f2c172669ff4c7ee609fb998c67ebedfa Mon Sep 17 00:00:00 2001
+From eba334b27e400e43ad5a9d2f56be5d0374558907 Mon Sep 17 00:00:00 2001
 From: Lukasz Derlatka <toranktto@gmail.com>
 Date: Mon, 11 Nov 2019 16:08:13 +0100
 Subject: [PATCH] Fix AssertionError when player hand set to empty type
@@ -19,10 +19,10 @@ index b098cd6d7..6184cced7 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f6fbba36f..a1ce2d2e0 100644
+index f88bcb29d..108377d76 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1429,6 +1429,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
              if (cancelled) {
                  this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
              } else {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 6a4242cb72fba34b45bb584f75c12da1acd0beb2
+Subproject commit 337955e3aaa71021164f5fef3ad5f2f9af8bb62c

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 807a677e9a59929e27ac1991c3fa1cf6a2ec0f4d
+Subproject commit 708be695398c23fe230cbaf7a5c21e6f1e150533