Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.

This update has been tested to ensure that World Conversion still occurs correctly.

Bukkit Changes:
0812ce2c SPIGOT-4397: isChunkGenerated API

CraftBukkit Changes:
4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support
eea43870 MC-134115: Fix issues converting tile entities
1a7f2d10 SPIGOT-4397: isChunkGenerated API
40aed54d SPIGOT-4396: Improve vehicle movement

Spigot Changes:
f6a273b1 Rebuild patches

7 files changed, 35 insertions, 44 deletions

diff --git a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
index 88930e5968..7e44d5e87b 100644
--- a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From ded2584ff9e9b1fdff41589c08a604d9ab0e9b80 Mon Sep 17 00:00:00 2001
+From 887263461cc0784c68f78ef9dab2d0c6106c0598 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -21,10 +21,10 @@ index 43239f844..fe8d34685 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 82c435207..56dee7aa2 100644
+index a51519dda..bf6f91917 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1341,6 +1341,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1350,6 +1350,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()}
@@ -32,7 +32,7 @@ index 82c435207..56dee7aa2 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1356,6 +1357,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1365,6 +1366,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()}
@@ -40,7 +40,7 @@ index 82c435207..56dee7aa2 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1405,6 +1407,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1414,6 +1416,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()}
@@ -48,7 +48,7 @@ index 82c435207..56dee7aa2 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1424,6 +1427,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1433,6 +1436,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()}
@@ -56,7 +56,7 @@ index 82c435207..56dee7aa2 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1479,6 +1483,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1488,6 +1492,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()}
@@ -64,7 +64,7 @@ index 82c435207..56dee7aa2 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1500,6 +1505,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1509,6 +1514,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()}
@@ -378,5 +378,5 @@ index ab71f3c31..358ea386b 100644
      ChatColor getColor() throws IllegalStateException;
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
index ea9a9334ed..35ea86f7ad 100644
--- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
@@ -1,4 +1,4 @@
-From 4ddcdfd0c5c246dc6af8d57823b7acfeb3dadc92 Mon Sep 17 00:00:00 2001
+From 3503f246b1f30c2609671fdc92b80b62e981d7db Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 9f3d805c2..f9d8b14c6 100644
+index bf6f91917..9ce6d7d57 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2,11 +2,14 @@ package org.bukkit;
@@ -24,7 +24,7 @@ index 9f3d805c2..f9d8b14c6 100644
  
  import org.bukkit.block.Biome;
  import org.bukkit.block.Block;
-@@ -435,6 +438,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -444,6 +447,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
  
@@ -264,5 +264,5 @@ index 9f3d805c2..f9d8b14c6 100644
       * Get a list of all players in this World
       *
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
index 14067ce754..aa389ba461 100644
--- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 6008613ba21322eb9e640a2597ea939572e450b3 Mon Sep 17 00:00:00 2001
+From ce6f1473f564bc740f9438a4c45876bdff15d691 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 00000000..50b52d6b
+index 000000000..50b52d6bf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 @@ -0,0 +1,416 @@
@@ -431,7 +431,7 @@ index 00000000..50b52d6b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 4d0acaf5..827aa00c 100644
+index 4d0acaf5b..827aa00c8 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
 @@ -82,6 +82,16 @@ public enum Particle {
@@ -452,10 +452,10 @@ index 4d0acaf5..827aa00c 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 0fb55b07..a8d97c51 100644
+index 9ce6d7d57..d20b940ac 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1742,7 +1742,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1751,7 +1751,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */
@@ -515,5 +515,5 @@ index 0fb55b07..a8d97c51 100644
      /**
       * Spawns the particle (the number of times specified by count)
 -- 
-2.16.1.windows.1
+2.19.0
 
diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch
index cbdef13eab..ea924cb49a 100644
--- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From aa05ec03ec60e2126c5c0389044b6532d7790a99 Mon Sep 17 00:00:00 2001
+From ef5875eebd65341d8a1651738ca82c417bf6a3eb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -98,10 +98,10 @@ index 162a76e8b..056a4d6bb 100644
      @Override
      public boolean equals(Object obj) {
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a8d97c519..1df38ba9d 100644
+index d20b940ac..673f1a3eb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -890,6 +890,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -899,6 +899,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(Location loc, float power, boolean setFire);
  
@@ -205,5 +205,5 @@ index a8d97c519..1df38ba9d 100644
       * Gets the {@link Environment} type of this world
       *
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
index acfe404713..91bbe2dc53 100644
--- a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From b751eab97b7a040cf6b8d47c94a2ee90f02cd5bf Mon Sep 17 00:00:00 2001
+From 9068935d9c8fc8d37ca47ceeef6e752c5ef84ecf Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 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 1df38ba9d..5e6cb56ab 100644
+index 673f1a3eb..51cf0bfe8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -690,6 +690,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -699,6 +699,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
  
@@ -26,5 +26,5 @@ index 1df38ba9d..5e6cb56ab 100644
       * Gets the unique name of this world
       *
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-API-Patches/0141-isChunkGenerated-API.patch b/Spigot-API-Patches/0141-isChunkGenerated-API.patch
index f4dba8d748..0eb201d9ee 100644
--- a/Spigot-API-Patches/0141-isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/0141-isChunkGenerated-API.patch
@@ -1,4 +1,4 @@
-From d0f944db060ea8e9ffd782f139bc26ce8948b33f Mon Sep 17 00:00:00 2001
+From fbbca41aee75b1949e0b4133ad2a87923d28328e Mon Sep 17 00:00:00 2001
 From: cswhite2000 <[email protected]>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
@@ -33,10 +33,10 @@ index 7e1ee875e..9457832bc 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 348f1c98d..9c06fc163 100644
+index c918c26be..d367e890f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -182,6 +182,26 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -182,6 +182,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
  
@@ -51,15 +51,6 @@ index 348f1c98d..9c06fc163 100644
 +        return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
 +    }
 +
-+    /**
-+     * Checks if a {@link Chunk} has been generated at the given coordinates.
-+     *
-+     * @param x X-coordinate of the chunk
-+     * @param z Z-coordinate of the chunk
-+     * @return true if the chunk has been generated, otherwise false
-+     */
-+    public boolean isChunkGenerated(int x, int z);
-+
      /**
       * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
       * as well as future support
diff --git a/Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch b/Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch
index 944c15df5b..d5b43af799 100644
--- a/Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch
+++ b/Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch
@@ -1,4 +1,4 @@
-From ed1936953435055091fc55bb268342ed8de59552 Mon Sep 17 00:00:00 2001
+From f63d962bbe2d56e72384b92df8819041d1e57d54 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Wed, 29 Aug 2018 00:37:30 -0400
 Subject: [PATCH] Add Force-Loaded Chunk API
@@ -30,12 +30,12 @@ index 8a8043351..4b9e0ca46 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9c06fc163..5379a649e 100644
+index d367e890f..7bfe0b684 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -202,6 +202,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      */
-     public boolean isChunkGenerated(int x, int z);
+@@ -193,6 +193,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+         return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
+     }
  
 +    /**
 +     * Checks if a chunk is force-loaded.