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
author: Aikar <[email protected]> 2018-09-26 22:35:42 -0400
committer: Aikar <[email protected]> 2018-09-26 22:35:46 -0400
commit: 2365b308c8a80e3aebf99680bd90e5025e7dec53 (patch)
tree: 554850ecac513073aa03211079c397aab215bd16
parent: c5fbde9f17a6cc61d350d6263051cc32c430c9a7 (diff)
download: Paper-2365b308c8a80e3aebf99680bd90e5025e7dec53.tar.gz
Paper-2365b308c8a80e3aebf99680bd90e5025e7dec53.zip
143 files changed, 548 insertions, 766 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.
diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
index f80be64e5f..b3fedff926 100644
--- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
+++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@@ -1,4 +1,4 @@
-From 914ca3a9a21de489bc689e6d0331e626f2b255e7 Mon Sep 17 00:00:00 2001
+From a4cd0a3d6497c3e0f9dc2e006b52b705d1624b56 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 01:40:13 -0400
 Subject: [PATCH] Add MinecraftKey Information to Objects
@@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index e8f7b7292d..7ff8e70b24 100644
+index 961966e169..56700fc596 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -171,7 +171,7 @@ public class PaperCommand extends Command {
@@ -19,7 +19,7 @@ index e8f7b7292d..7ff8e70b24 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8997cf84a4..044f7b5aa0 100644
+index ffaa425ec8..19a3ba79f2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -46,7 +46,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
@@ -40,7 +40,7 @@ index 8997cf84a4..044f7b5aa0 100644
      private int id;
      public boolean j;
      public final List<Entity> passengers;
-@@ -1758,12 +1758,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1761,12 +1761,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -147,5 +147,5 @@ index 62b6e6eb38..7390061bf0 100644
      public World getWorld() {
          return this.world;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index aec4ad5254..04d7f987d4 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From adb1bf0b7b613b6d5da49bef66002db629bb0377 Mon Sep 17 00:00:00 2001
+From ec579a0138fdc32c33ab4b1eef277e559a592b23 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b7c40d5ce6..238139c73a 100644
+index f64bfa1b95..16aa7f8f79 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess {
@@ -85,7 +85,7 @@ index b7c40d5ce6..238139c73a 100644
      }
  
      public boolean c(BlockPosition blockposition) {
-@@ -837,6 +867,7 @@ public class Chunk implements IChunkAccess {
+@@ -849,6 +879,7 @@ public class Chunk implements IChunkAccess {
                      }
                  }
                  // Spigot End
@@ -94,7 +94,7 @@ index b7c40d5ce6..238139c73a 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 044f7b5aa0..591ae114cf 100644
+index 19a3ba79f2..aa9e4ef5ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -106,7 +106,7 @@ index 044f7b5aa0..591ae114cf 100644
      public int ae; public int getChunkX() { return ae; } // Paper - OBFHELPER
      public int af; public int getChunkY() { return af; } // Paper - OBFHELPER
      public int ag; public int getChunkZ() { return ag; } // Paper - OBFHELPER
-@@ -1759,6 +1759,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1762,6 +1762,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -192,5 +192,5 @@ index 5cce3644d0..7a204e8edf 100644
          /**
           * Order is *EXTREMELY* important -- keep it right! =D
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index f96303a3f1..9ad2064f54 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From d045cbcae5841f09140c7a422f294de234942747 Mon Sep 17 00:00:00 2001
+From d4b39b8ec7ba1b81f51e9ace99e7e1e767976691 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..a6292f1d7
+index 0000000000..a6292f1d74
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 000000000..a6292f1d7
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..145cb274b
+index 0000000000..145cb274b0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -253,7 +253,7 @@ index 000000000..145cb274b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d2efcca80..4812da0da 100644
+index d2efcca80a..4812da0dac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -297,7 +297,7 @@ index d2efcca80..4812da0da 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 8811dbc9b..7818a3b6a 100644
+index 8811dbc9b3..7818a3b6a7 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -23,6 +23,15 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index 8811dbc9b..7818a3b6a 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index e3d1761b4..fbebd4591 100644
+index e3d1761b49..fbebd4591c 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -348,7 +348,7 @@ index e3d1761b4..fbebd4591 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 3045d6d06..68212aa26 100644
+index 0c8c10b7a7..31ed3e43a5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -90,7 +90,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -389,7 +389,7 @@ index 3045d6d06..68212aa26 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index df07b2b88..f969c036f 100644
+index 1a32149dbf..43f77a3987 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -399,7 +399,7 @@ index df07b2b88..f969c036f 100644
  import com.google.common.collect.Maps;
  import com.mojang.datafixers.DataFixTypes;
  import com.mojang.datafixers.DataFixer;
-@@ -678,7 +679,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -682,7 +683,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      public void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) {
          NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
          World world = chunk.getWorld();
@@ -408,7 +408,7 @@ index df07b2b88..f969c036f 100644
  
          for (int i = 0; i < nbttaglist.size(); ++i) {
              NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
-@@ -687,8 +688,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -691,8 +692,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              chunk.f(true);
          }
  
@@ -417,7 +417,7 @@ index df07b2b88..f969c036f 100644
          NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10);
  
          for (int j = 0; j < nbttaglist1.size(); ++j) {
-@@ -705,8 +704,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -709,8 +708,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -426,7 +426,7 @@ index df07b2b88..f969c036f 100644
  
          if (nbttagcompound.hasKeyOfType("TileTicks", 9) && world.J() instanceof TickListServer) {
              ((TickListServer) world.J()).a(nbttagcompound.getList("TileTicks", 10));
-@@ -715,7 +712,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -719,7 +716,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          if (nbttagcompound.hasKeyOfType("LiquidTicks", 9) && world.I() instanceof TickListServer) {
              ((TickListServer) world.I()).a(nbttagcompound.getList("LiquidTicks", 10));
          }
@@ -436,7 +436,7 @@ index df07b2b88..f969c036f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index b7cdc495a..8b9b076de 100644
+index b7cdc495a3..8b9b076ded 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -13,12 +13,22 @@ public class CustomFunction {
@@ -463,7 +463,7 @@ index b7cdc495a..8b9b076de 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 4d7e15179..40ff72f72 100644
+index 4d7e151793..40ff72f725 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -109,7 +109,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -476,7 +476,7 @@ index 4d7e15179..40ff72f72 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index d8535fdd9..22f3a08e9 100644
+index d8535fdd9e..22f3a08e98 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@@ -529,7 +529,7 @@ index d8535fdd9..22f3a08e9 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5914439b1..f1cf6cf1c 100644
+index aa9e4ef5ee..320146783b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -551,7 +551,7 @@ index 5914439b1..f1cf6cf1c 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -536,7 +537,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -537,7 +538,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
@@ -559,7 +559,7 @@ index 5914439b1..f1cf6cf1c 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().d(d0, d1, d2));
              this.recalcPosition();
-@@ -886,7 +886,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -887,7 +887,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.methodProfiler.e();
          }
@@ -568,7 +568,7 @@ index 5914439b1..f1cf6cf1c 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 76cc9085b..ce79887cf 100644
+index 76cc9085bd..ce79887cf4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -644,7 +644,7 @@ index 76cc9085b..ce79887cf 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ae31935c4..70c9b1f50 100644
+index ae31935c48..70c9b1f50c 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -168,7 +168,7 @@ public class EntityTracker {
@@ -675,7 +675,7 @@ index ae31935c4..70c9b1f50 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac534ea3e..bb4d2cabf 100644
+index ac534ea3ee..bb4d2cabfe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -828,7 +828,7 @@ index ac534ea3e..bb4d2cabf 100644
          this.methodProfiler.e();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ac6d8cc6e..d975c2ccf 100644
+index ac6d8cc6e6..d975c2ccf1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -922,7 +922,7 @@ index ac6d8cc6e..d975c2ccf 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cbc86feb7..30f909a1d 100644
+index 8db0b6a6db..fa20e1d26c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -933,7 +933,7 @@ index cbc86feb7..30f909a1d 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1625,7 +1626,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1627,7 +1628,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -942,7 +942,7 @@ index cbc86feb7..30f909a1d 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1636,7 +1637,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1638,7 +1639,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -951,7 +951,7 @@ index cbc86feb7..30f909a1d 100644
              return;
          }
  
-@@ -1649,7 +1650,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1651,7 +1652,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -961,7 +961,7 @@ index cbc86feb7..30f909a1d 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 616797dc6..3a5daf670 100644
+index 616797dc6e..3a5daf6705 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,10 +1,16 @@
@@ -982,7 +982,7 @@ index 616797dc6..3a5daf670 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ead9697e6..26df2ff32 100644
+index ead9697e65..26df2ff32f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1006,7 +1006,7 @@ index ead9697e6..26df2ff32 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index a07895935..ee5c2421b 100644
+index a07895935e..ee5c2421bb 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@@ -1060,7 +1060,7 @@ index a07895935..ee5c2421b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497..68ac014aa 100644
+index c69209497b..68ac014aab 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1080,7 +1080,7 @@ index c69209497..68ac014aa 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f381e23be..a934a4b30 100644
+index f381e23beb..a934a4b307 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1195,7 +1195,7 @@ index f381e23be..a934a4b30 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4be2d8d3c..e4d03b677 100644
+index 4be2d8d3c4..e4d03b6779 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1302,7 +1302,7 @@ index 4be2d8d3c..e4d03b677 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e659f3f33..944fca34c 100644
+index e659f3f339..944fca34c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1896,12 +1896,31 @@ public final class CraftServer implements Server {
@@ -1339,7 +1339,7 @@ index e659f3f33..944fca34c 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 4c8ab2bc9..000000000
+index 4c8ab2bc97..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1518,7 +1518,7 @@ index 4c8ab2bc9..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f0..52a8c48fa 100644
+index 413dd35f06..52a8c48fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1554,7 +1554,7 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9f78f2c4a..b8bdcb6b7 100644
+index 9f78f2c4ae..b8bdcb6b74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1715,6 +1715,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1571,7 +1571,7 @@ index 9f78f2c4a..b8bdcb6b7 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index f11bd7545..93b9134d6 100644
+index f11bd7545f..93b9134d6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1647,7 +1647,7 @@ index f11bd7545..93b9134d6 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 7e7ce9a81..46029ce24 100644
+index 7e7ce9a81b..46029ce246 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1729,7 +1729,7 @@ index 7e7ce9a81..46029ce24 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b78..3d90b34268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1741,7 +1741,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e60fe5a92..f68e42c4d 100644
+index e60fe5a920..f68e42c4d4 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 70a0d7ca7a..11161767e3 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,11 +1,11 @@
-From 5b4305e22c82f4e10966cb8a0682ac1467972358 Mon Sep 17 00:00:00 2001
+From 12e9eb10a5ab02e4a5c0bb869ec4115f93f458db Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cef0c47ac7..38a697e1b7 100644
+index 3f734327c0..1ed58f4bba 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -114,4 +114,14 @@ public class PaperWorldConfig {
@@ -24,10 +24,10 @@ index cef0c47ac7..38a697e1b7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ec5c9fd735..15b6067aab 100644
+index 320146783b..06b7182a45 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1862,6 +1862,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1865,6 +1865,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
@@ -76,5 +76,5 @@ index 7edc028527..5ceb3f2068 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
index 29745d24d8..2077477fee 100644
--- a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,14 +1,14 @@
-From 251b37e314fbc058339d37db98b0e8cf6c34c236 Mon Sep 17 00:00:00 2001
+From 3ea8c91ea0db1aace5cffaf8bc8712928c962e43 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index eb0411ec8..4622e92b0 100644
+index e737d5a4df..2f33b4208c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -780,6 +780,10 @@ public class Chunk implements IChunkAccess {
+@@ -792,6 +792,10 @@ public class Chunk implements IChunkAccess {
              tileentity.z();
              this.tileEntities.put(blockposition, tileentity);
              // CraftBukkit start
@@ -20,5 +20,5 @@ index eb0411ec8..4622e92b0 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + getType(blockposition) + ") where there was no entity tile!");
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index ef53eb74cc..e14da2621d 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From 2af749a07a38005528f7dab2944ce7655a79568e Mon Sep 17 00:00:00 2001
+From 0569c054bc082c7132d80e304ec79a176ce9de5c Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8b40fcfa77..38615f9eea 100644
+index 06b7182a45..45ea6b138e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -162,6 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 8b40fcfa77..38615f9eea 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1603,6 +1604,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1606,6 +1607,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  }
              }
  
@@ -28,7 +28,7 @@ index 8b40fcfa77..38615f9eea 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1744,6 +1750,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1747,6 +1753,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index 8b40fcfa77..38615f9eea 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1819,6 +1832,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1822,6 +1835,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -101,7 +101,7 @@ index 769d599c59..e37da10e09 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase)this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 29d98ae30b..8984949ff5 100644
+index 5dfa0fdec3..e4c1010748 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -968,6 +968,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index 19534ea55b..e4353312af 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,11 +1,11 @@
-From d80b7a127cccc204af74b7d87ee289ff70515d67 Mon Sep 17 00:00:00 2001
+From 06b4daeb281d364d517f651e8d65f04bfd2485a8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38a697e1b7..68898d624f 100644
+index 1ed58f4bba..39d565db1f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -124,4 +124,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index 38a697e1b7..68898d624f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 02ac5c4c0c..f6cdff0ef9 100644
+index 45ea6b138e..6b413833da 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -462,9 +462,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -463,9 +463,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.fallDistance *= 0.5F;
          }
  
@@ -39,7 +39,7 @@ index 02ac5c4c0c..f6cdff0ef9 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -474,6 +480,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -475,6 +481,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.world.methodProfiler.e();
      }
  
@@ -54,7 +54,7 @@ index 02ac5c4c0c..f6cdff0ef9 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -525,6 +539,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -526,6 +540,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
@@ -83,5 +83,5 @@ index 025158675f..932fbff7c7 100644
          int i;
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch
index 120553d661..6fb1f96d9a 100644
--- a/Spigot-Server-Patches/0028-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 0456b068872c42d73906d26a8cbba37ea9be9ae6 Mon Sep 17 00:00:00 2001
+From 98b1b56527d727395f8e97e6fcab6e533f54b9c0 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -61,7 +61,7 @@ index 39d565db1f..8f6f0288be 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4622e92b05..e43442c8bd 100644
+index 2f33b4208c..8f2de5a327 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -38,7 +38,7 @@ public class Chunk implements IChunkAccess {
@@ -118,7 +118,7 @@ index 4622e92b05..e43442c8bd 100644
                  }
  
                  TileEntity tileentity;
-@@ -974,10 +978,16 @@ public class Chunk implements IChunkAccess {
+@@ -986,10 +990,16 @@ public class Chunk implements IChunkAccess {
          return false;
      }
  
@@ -138,7 +138,7 @@ index 4622e92b05..e43442c8bd 100644
  
          this.u = true;
  
-@@ -1307,6 +1317,16 @@ public class Chunk implements IChunkAccess {
+@@ -1349,6 +1359,16 @@ public class Chunk implements IChunkAccess {
          return this.D == 8;
      }
  
@@ -156,7 +156,7 @@ index 4622e92b05..e43442c8bd 100644
  
          IMMEDIATE, QUEUED, CHECK;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 68212aa26e..046973a4ed 100644
+index 31ed3e43a5..0b03c6266a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -314,6 +314,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
index 096e335b43..f1defee6ca 100644
--- a/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 0fa59505438a8647ef9fd65b735b57bd8b780680 Mon Sep 17 00:00:00 2001
+From 320d0a1aa6bf90279d552231fde09b66da0ef1ca Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 30f909a1d..b7d38ab05 100644
+index fa20e1d26c..7362b73b20 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1558,6 +1558,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1560,6 +1560,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index 30f909a1d..b7d38ab05 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 83f2cfc66..7f711cd64 100644
+index 83f2cfc66c..7f711cd642 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -696,6 +696,29 @@ public final class CraftServer implements Server {
@@ -82,7 +82,7 @@ index 83f2cfc66..7f711cd64 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index a0cdd2317..984df4083 100644
+index a0cdd2317c..984df4083d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -14,6 +14,7 @@ public class ServerShutdownThread extends Thread {
@@ -94,7 +94,7 @@ index a0cdd2317..984df4083 100644
          } catch (ExceptionWorldConflict ex) {
              ex.printStackTrace();
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 4b3aa85c9..e44c23016 100644
+index 4b3aa85c97..e44c230165 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -6,6 +6,7 @@ public class AsyncCatcher
@@ -106,7 +106,7 @@ index 4b3aa85c9..e44c23016 100644
      public static void catchOp(String reason)
      {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 49768734d..947c43a5d 100644
+index 49768734d0..947c43a5d0 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -43,6 +43,7 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
index 93daeb2a5b..d9be9e08f5 100644
--- a/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From e61e80dd98e4bd16ff5d3277d7d7666b248eedca Mon Sep 17 00:00:00 2001
+From 5a87db053c7f449bbf969d895202b3fb6ed82ed4 Mon Sep 17 00:00:00 2001
 From: CullanP <[email protected]>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 703c377f93..a04a296172 100644
+index 8f2de5a327..3647d12ee2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -91,6 +91,10 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index 703c377f93..a04a296172 100644
          entity.setCurrentChunk(null);
          entityCounts.decrement(entity.getMinecraftKeyString());
          // Paper end
-@@ -912,6 +926,15 @@ public class Chunk implements IChunkAccess {
+@@ -924,6 +938,15 @@ public class Chunk implements IChunkAccess {
              if (!this.entitySlices[k].isEmpty()) {
                  Iterator iterator = this.entitySlices[k].iterator();
  
@@ -68,7 +68,7 @@ index 703c377f93..a04a296172 100644
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
  
-@@ -948,7 +971,18 @@ public class Chunk implements IChunkAccess {
+@@ -960,7 +983,18 @@ public class Chunk implements IChunkAccess {
          i = MathHelper.clamp(i, 0, this.entitySlices.length - 1);
          j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
  
diff --git a/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
index 36a027159e..809303cb87 100644
--- a/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 14083c3e9a3f5e184795d82f42a51a3541b4dbd9 Mon Sep 17 00:00:00 2001
+From 29d87f4766b15630691b1f4cfe68a506109bc545 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -50,7 +50,7 @@ index 0000000000..93397188b7
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a04a296172..ab579b9052 100644
+index 3647d12ee2..fc0f052c70 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -68,7 +68,7 @@ index a04a296172..ab579b9052 100644
      public IBlockData getType(BlockPosition blockposition) {
          return this.getBlockData(blockposition.getX(), blockposition.getY(), blockposition.getZ());
      }
-@@ -803,10 +805,15 @@ public class Chunk implements IChunkAccess {
+@@ -815,10 +817,15 @@ public class Chunk implements IChunkAccess {
              this.tileEntities.remove(blockposition);
              // Paper end
          } else {
@@ -89,7 +89,7 @@ index a04a296172..ab579b9052 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 046973a4ed..d73034f329 100644
+index 0b03c6266a..d16fc452e3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -15,6 +15,7 @@ import java.util.function.BooleanSupplier;
diff --git a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
index c2eb2e1c9f..0aeb51a44b 100644
--- a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From ce75d9ed561e8349ed8ea8b1aad81bb1ebfa5f48 Mon Sep 17 00:00:00 2001
+From 24304ff50be7b3cf2f813bfaebc10574d2eb0e89 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -25,10 +25,10 @@ index 50837d767f..898068a817 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b61a7706fa..1722573ffc 100644
+index 6b413833da..43ceb2fb18 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2244,6 +2244,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2247,6 +2247,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase be() {
diff --git a/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
index 4df7d826ed..bbe9030175 100644
--- a/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 6bc2658cdc074c1594d3b22de8c3f12bf7cda691 Mon Sep 17 00:00:00 2001
+From 8614fe1a1f8fa80b14d30b1b9887a169ecff6e51 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -53,7 +53,7 @@ index d9608121b6..d7a6700936 100644
          return a(this.x, this.z);
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f969c036f3..e831ea1429 100644
+index 43f77a3987..4a0f3989e6 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -22,6 +22,7 @@ import java.util.function.Consumer;
@@ -94,7 +94,7 @@ index f969c036f3..e831ea1429 100644
      private final File c;
      private final DataFixer d;
      private PersistentStructureLegacy e;
-@@ -78,7 +99,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -82,7 +103,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      @Nullable
      private NBTTagCompound a(DimensionManager dimensionmanager, @Nullable PersistentCollection persistentcollection, int i, int j, @Nullable GeneratorAccess generatoraccess) throws IOException {
@@ -103,7 +103,7 @@ index f969c036f3..e831ea1429 100644
  
          if (nbttagcompound != null) {
              return nbttagcompound;
-@@ -306,7 +327,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -310,7 +331,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  };
              }
  
@@ -112,7 +112,7 @@ index f969c036f3..e831ea1429 100644
              // Spigot end
          } catch (Exception exception) {
              ChunkRegionLoader.a.error("Failed to save chunk", exception);
-@@ -315,7 +336,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -319,7 +340,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      protected void a(ChunkCoordIntPair chunkcoordintpair, Supplier<NBTTagCompound> nbttagcompound) { // Spigot
@@ -122,7 +122,7 @@ index f969c036f3..e831ea1429 100644
          FileIOThread.a().a(this);
      }
  
-@@ -325,19 +347,24 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -329,19 +351,24 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      private boolean processSaveQueueEntry(boolean logCompletion) {
@@ -154,7 +154,7 @@ index f969c036f3..e831ea1429 100644
  
              if (nbttagcompound == null) {
                  return true;
-@@ -346,6 +373,15 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -350,6 +377,15 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                      // CraftBukkit start
                      RegionFileCache.write(this.c, chunkcoordintpair.x, chunkcoordintpair.z, SupplierUtils.getIfExists(nbttagcompound)); // Spigot
  
diff --git a/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
index b50763022e..c25eda8f02 100644
--- a/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From d428f995faa24a9963d176e021fb5750f7f68281 Mon Sep 17 00:00:00 2001
+From 9045b80f44943e175475fc97925e8b453f5f3e55 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 219970a647..e7c79b2820 100644
+index e31c97fb72..7275c4d21a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2559,7 +2559,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2562,7 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
@@ -20,5 +20,5 @@ index 219970a647..e7c79b2820 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              DimensionManager dimensionmanager = worldserver1.dimension;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
index 1929e90b55..a93acddba2 100644
--- a/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From c3f08fd75a1a0b15b50b64ae94c504f1c0c6199c Mon Sep 17 00:00:00 2001
+From 813f611f2db93839add4f0664004ec2221717b9b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -23,10 +23,10 @@ index deb4ec2543..dd23ea45e5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e279f97d77..35be0a3fc1 100644
+index b783cdf8ed..9214b50b1c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1246,7 +1246,7 @@ public class Chunk implements IChunkAccess {
+@@ -1258,7 +1258,7 @@ public class Chunk implements IChunkAccess {
      }
  
      public long m() {
diff --git a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
index a6d24efd84..9ab4f31c18 100644
--- a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From a4e04803a51a04f1963738c2c8b147ad162daed0 Mon Sep 17 00:00:00 2001
+From 9555bec7234cbae0515c187301f36f774c8dee55 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index a4b98c81f5..53d38ea40f 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 62f35d2672..306ef5bf79 100644
+index 7362b73b20..4df7b4a249 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1903,6 +1903,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1905,6 +1905,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 62f35d2672..306ef5bf79 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 9d619c523f..a865b44e0e 100644
--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 4e0414000856c4febcebbaa912228717e9e183de Mon Sep 17 00:00:00 2001
+From 6a1c0d9780b2f6e6bfe3f23b76f594a7804aa0ee Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -91,10 +91,10 @@ index eb17d5e957..ffa6a46b78 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ac44dfeefb..50923951a5 100644
+index 9756ca3a4f..72d1a0f51d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1275,8 +1275,9 @@ public class CraftWorld implements World {
+@@ -1280,8 +1280,9 @@ public class CraftWorld implements World {
          int chunkCoordX = chunkcoordinates.getX() >> 4;
          int chunkCoordZ = chunkcoordinates.getZ() >> 4;
          // Cycle through the 25x25 Chunks around it to load/unload the chunks.
diff --git a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 8a57dff2b6..c71653e77a 100644
--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From cec19ced0037b20703b306ec306aa712a8cc7371 Mon Sep 17 00:00:00 2001
+From 2f0129988321a32c8f6f02aebaf00ba68d9546aa Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -19,10 +19,10 @@ index 6fe3c0ea8a..cf523a3e48 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e7c79b2820..5e3a1094e8 100644
+index 7275c4d21a..83de2d63a5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2256,6 +2256,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2259,6 +2259,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.getFlag(5);
      }
  
@@ -31,10 +31,10 @@ index e7c79b2820..5e3a1094e8 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 35159bcd8f..ef585b741b 100644
+index 4df7b4a249..ba690d5bd0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1632,7 +1632,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1634,7 +1634,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
diff --git a/Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch
index fc9fcbcc60..e96ec160ab 100644
--- a/Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,4 +1,4 @@
-From 256e32e72d31dd0a1c7d3f09116c7c84fd6b38ab Mon Sep 17 00:00:00 2001
+From 611a1ded44d2d8ec46252f67a0ab9e57b0ea2681 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
@@ -32,10 +32,10 @@ index db3e70e97a..ff1a2046f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0952bff5c0..b73a4e6b37 100644
+index 5e5c241669..c17e41f128 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1170,6 +1170,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1172,6 +1172,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean aq() {
@@ -48,7 +48,7 @@ index 0952bff5c0..b73a4e6b37 100644
          return this.isInWater() || this.q();
      }
  
-@@ -2721,6 +2727,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2724,6 +2730,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bw() {
diff --git a/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 6426848b1a..7189a376d5 100644
--- a/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From bf7d878872dbb0130ca064d5d083c572ec3ff81c Mon Sep 17 00:00:00 2001
+From a341e096df2f6447ad537792fea5a00111150460 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -40,7 +40,7 @@ index ff1a2046f6..0cd15c17e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 35be0a3fc1..297ead5a77 100644
+index 9214b50b1c..2ec5b084fb 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -37,6 +37,7 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index 35be0a3fc1..297ead5a77 100644
      public final int locZ;
      private boolean l; public boolean needsGapCheck() { return l; } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b1e6901090..9739288b53 100644
+index 2d10f4aa37..719d5deb2c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -306,6 +306,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -151,10 +151,10 @@ index 785f020652..d31101861c 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 50923951a5..8421c397a1 100644
+index 72d1a0f51d..3536433d14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1628,7 +1628,7 @@ public class CraftWorld implements World {
+@@ -1633,7 +1633,7 @@ public class CraftWorld implements World {
          ChunkProviderServer cps = world.getChunkProviderServer();
          for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
              // If in use, skip it
diff --git a/Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch
index 698365e1c2..61bb7dd5f9 100644
--- a/Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 009ed21b65fa5fd70773813da89fde40d26e22ff Mon Sep 17 00:00:00 2001
+From e9a6944ae559c0a4a1bae5fae0dd0040cb11fc31 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,10 +8,10 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index e831ea1429..d40d9d1173 100644
+index 4a0f3989e6..695044b1b1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -1048,7 +1048,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -1052,7 +1052,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      public static void a(Entity entity, GeneratorAccess generatoraccess, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
diff --git a/Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch
index 1f16c2f24c..37c4014759 100644
--- a/Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 0625120d53d0e958a4bd2bf8e08390bf8c353f88 Mon Sep 17 00:00:00 2001
+From c6c82ca57a41053a7ef349c3677caff7c1a98c16 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc72398715..078230521f 100644
+index ba690d5bd0..1dce60f8cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -356,7 +356,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -15,8 +15,8 @@ index cc72398715..078230521f 100644
 -                    PlayerConnection.LOGGER.warn("{} moved wrongly!", entity.getDisplayName().getString());
 +                    PlayerConnection.LOGGER.warn(entity.getName() + " (vehicle of " + this.player.getName() + ") moved wrongly!"); // Paper - More informative
                  }
+                 Location curPos = this.getPlayer().getLocation(); // Spigot
  
-                 entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch
index 319461aa5c..bf64f68ea6 100644
--- a/Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 9ea05aab2d38b0135649160310d6b46a1133d409 Mon Sep 17 00:00:00 2001
+From d1354d3543da02c852dd4a504a976e32ee17231d Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 078230521f..def0db5fea 100644
+index 1dce60f8cc..aad33272f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2096,7 +2096,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2098,7 +2098,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.d() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index 078230521f..def0db5fea 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch
index c63b473439..7c7aff8067 100644
--- a/Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From 6db5fa5b0827cd005ec846e2b949b02b58145fa0 Mon Sep 17 00:00:00 2001
+From 1e0f93b52900c0101dc51f4c99a768f9e5862a9b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,10 +23,10 @@ index 2fc6585c0e..d78f6516e5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9e96055058..ef3c1260b0 100644
+index aad33272f0..598b747ec0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1199,13 +1199,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1201,13 +1201,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/Spigot-Server-Patches/0136-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0136-Auto-Save-Improvements.patch
index 24653573e2..18057693db 100644
--- a/Spigot-Server-Patches/0136-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0136-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 9f3cfa798dee82bfecaa93a68036552fd5f28c52 Mon Sep 17 00:00:00 2001
+From c1069c1fee52e5843abcd569f7cd81038e813812 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -64,7 +64,7 @@ index 0cd15c17e8..c43152f456 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 297ead5a77..ccde5e8e29 100644
+index 2ec5b084fb..c76be9c668 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -50,9 +50,9 @@ public class Chunk implements IChunkAccess {
@@ -79,7 +79,7 @@ index 297ead5a77..ccde5e8e29 100644
      private int y;
      private long z;
      private int A;
-@@ -1022,11 +1022,11 @@ public class Chunk implements IChunkAccess {
+@@ -1034,11 +1034,11 @@ public class Chunk implements IChunkAccess {
              if (this.v && this.world.getTime() != this.lastSaved || this.x) {
                  return true;
              }
@@ -96,7 +96,7 @@ index 297ead5a77..ccde5e8e29 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9739288b53..a35eac043c 100644
+index 719d5deb2c..69219b13a6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -241,7 +241,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch
index 71b87a2e5c..660051a171 100644
--- a/Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 0b64e86c9b2a49148db5eb96be7824722994b798 Mon Sep 17 00:00:00 2001
+From ed6c926fa07218cd3d49a058c7f2615aa0e18f9d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@@ -19,10 +19,10 @@ index c43152f456..0d456bcbac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ccde5e8e29..fcc0e21d16 100644
+index c76be9c668..a8705776a6 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -827,6 +827,12 @@ public class Chunk implements IChunkAccess {
+@@ -839,6 +839,12 @@ public class Chunk implements IChunkAccess {
                              "Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16));
              e.printStackTrace();
              ServerInternalException.reportInternalException(e);
@@ -35,7 +35,7 @@ index ccde5e8e29..fcc0e21d16 100644
              // Paper end
              // CraftBukkit end
          }
-@@ -836,6 +842,7 @@ public class Chunk implements IChunkAccess {
+@@ -848,6 +854,7 @@ public class Chunk implements IChunkAccess {
          this.h.put(new BlockPosition(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z")), nbttagcompound);
      }
  
diff --git a/Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index a9e41fb886..60c3bca0c0 100644
--- a/Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 4eadcee4a45aaefbec56d8bffb297242c0f54ffd Mon Sep 17 00:00:00 2001
+From 89272c5e36c53839aff3a46f1708867131a356e9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -23,7 +23,7 @@ index 0d456bcbac..40746c13ef 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a35eac043c..8acbd7bbff 100644
+index 69219b13a6..5197062293 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -234,6 +234,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -41,10 +41,10 @@ index a35eac043c..8acbd7bbff 100644
                  Chunk chunk = (Chunk) objectiterator.next();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d40d9d1173..fc8f7574cf 100644
+index 695044b1b1..e86d47a05e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -148,6 +148,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -152,6 +152,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      }
  
diff --git a/Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch
index 8223dce56a..85c68916f9 100644
--- a/Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 71c127a8ceda8537198adecb9db62402cb66b25d Mon Sep 17 00:00:00 2001
+From 2803838d0058fe88698e854f9fa2bff26baba686 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -8,13 +8,13 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 8acbd7bbff..edb4f2bb65 100644
+index 5197062293..e4d2a3a0b5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -30,6 +30,11 @@ public class ChunkProviderServer implements IChunkProvider {
      public final LongSet unloadQueue = new LongOpenHashSet();
      public final ChunkGenerator<?> chunkGenerator;
-     private final IChunkLoader chunkLoader;
+     public final IChunkLoader chunkLoader; // PAIL
 +    // Paper start - chunk save stats
 +    private long lastQueuedSaves = 0L; // Paper
 +    private long lastProcessedSaves = 0L; // Paper
@@ -54,10 +54,10 @@ index 8acbd7bbff..edb4f2bb65 100644
                  return false;
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index fc8f7574cf..94ed728c0e 100644
+index e86d47a05e..ec328126cf 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -148,7 +148,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -152,7 +152,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      }
  
@@ -72,7 +72,7 @@ index fc8f7574cf..94ed728c0e 100644
  
      // CraftBukkit start - Add async variant, provide compatibility
      @Nullable
-@@ -340,6 +346,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -344,6 +350,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      protected void a(ChunkCoordIntPair chunkcoordintpair, Supplier<NBTTagCompound> nbttagcompound) { // Spigot
          this.saveMap.put(chunkcoordintpair.asLong(), nbttagcompound); // Paper
          queue.add(new QueuedChunk(chunkcoordintpair, nbttagcompound)); // Paper - Chunk queue improvements
@@ -80,7 +80,7 @@ index fc8f7574cf..94ed728c0e 100644
          FileIOThread.a().a(this);
      }
  
-@@ -367,6 +374,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -371,6 +378,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              // Paper end
              ChunkCoordIntPair chunkcoordintpair = chunk.coords; // Paper - Chunk queue improvements
              Supplier<NBTTagCompound> nbttagcompound = chunk.compoundSupplier; // Spigot // Paper
@@ -89,5 +89,5 @@ index fc8f7574cf..94ed728c0e 100644
              if (nbttagcompound == null) {
                  return true;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch
index 0b82368a39..64ff4f1a02 100644
--- a/Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 8f7d709d7d915e21562e03de560842df5581c139 Mon Sep 17 00:00:00 2001
+From 2d438b4f1bf1a3e6c38d09aa04a3db8539006e72 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 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 e3ac9eb7..3644fde3 100644
+index e3ac9eb7d5..3644fde3bb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1550,7 +1550,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index e3ac9eb7..3644fde3 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 37b3dd69..316fed5b 100644
+index a1c878fb4a..3a91d91e8e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2515,7 +2515,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2517,7 +2517,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public final boolean isDisconnected() {
@@ -32,5 +32,5 @@ index 37b3dd69..316fed5b 100644
      // CraftBukkit end
  }
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
index f323c6126c..87d3fd0a6e 100644
--- a/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 94736b18aa282608640f0b08be6f947e1e9e5fef Mon Sep 17 00:00:00 2001
+From e030fa78633b5f04e1fa8a54c811c08430babc74 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,10 +7,10 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f39482696..e05ad05a4 100644
+index f83a28dfda..8aa3ffdde0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -225,6 +225,7 @@ public class CraftWorld implements World {
+@@ -230,6 +230,7 @@ public class CraftWorld implements World {
      }
  
      private boolean unloadChunk0(int x, int z, boolean save) {
@@ -18,7 +18,7 @@ index f39482696..e05ad05a4 100644
          net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z, false, false);
          if (chunk == null) {
              return true;
-@@ -232,6 +233,7 @@ public class CraftWorld implements World {
+@@ -237,6 +238,7 @@ public class CraftWorld implements World {
  
          // If chunk had previously been queued to save, must do save to avoid loss of that data
          return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save);
diff --git a/Spigot-Server-Patches/0169-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0169-Don-t-allow-entities-to-ride-themselves-572.patch
index 9868936872..5e1fe6d51d 100644
--- a/Spigot-Server-Patches/0169-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0169-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,14 +1,14 @@
-From 94def123ad430b43c241982b2aa937372df72db3 Mon Sep 17 00:00:00 2001
+From 55d44b2de264f4b08c1ee8ccdb61f3b4b3b6eaeb Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 653bc6cd69..f3422a097b 100644
+index a41dfb6e50..45cd8dca16 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2073,6 +2073,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2076,6 +2076,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean o(Entity entity) { // CraftBukkit
@@ -17,5 +17,5 @@ index 653bc6cd69..f3422a097b 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0170-Fix-block-break-desync.patch b/Spigot-Server-Patches/0170-Fix-block-break-desync.patch
index 13694912f7..0969c3724f 100644
--- a/Spigot-Server-Patches/0170-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0170-Fix-block-break-desync.patch
@@ -1,14 +1,14 @@
-From b3ad34c21c285e2b9c65597ebe1a722ae8c536ad Mon Sep 17 00:00:00 2001
+From ab62f49cb56d09e6b0059c9a7207774c1d70c3bf Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9de392315e..7f61da1cd3 100644
+index 3a91d91e8e..fb0f77f1b3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1158,6 +1158,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1160,6 +1160,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
              if (d3 > 36.0D) {
@@ -18,5 +18,5 @@ index 9de392315e..7f61da1cd3 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 100662bb6d..831a048821 100644
--- a/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 24977bb5b127d9c7c419933c30db4f8485ecf586 Mon Sep 17 00:00:00 2001
+From 4950fa11a0b1880791c6424f0585497011de8013 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 7818a3b6a..d55b076f5 100644
+index 7818a3b6a7..d55b076f5d 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -454,13 +454,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index 7818a3b6a..d55b076f5 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index b9afeaf72..2c735a920 100644
+index b9afeaf72e..2c735a920d 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index b9afeaf72..2c735a920 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 880f49652..31c8d4bc8 100644
+index 880f496526..31c8d4bc86 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@@ -120,7 +120,7 @@ index 880f49652..31c8d4bc8 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 81de03084..4c92896ef 100644
+index 81de03084a..4c92896ef8 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@@ -133,7 +133,7 @@ index 81de03084..4c92896ef 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 91f831326..398ad151a 100644
+index 91f831326c..398ad151a0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
@@ -147,7 +147,7 @@ index 91f831326..398ad151a 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index a5e1939e0..e73dba09a 100644
+index a5e1939e05..e73dba09a6 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f03092f4d..e37fca5b1 100644
+index f03092f4d1..e37fca5b12 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -411,7 +411,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -173,7 +173,7 @@ index f03092f4d..e37fca5b1 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 4a128f707..b87096467 100644
+index 4a128f707b..b870964674 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -186,7 +186,7 @@ index 4a128f707..b87096467 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 1bfa7e5e6..4e4418032 100644
+index 1bfa7e5e69..4e44180329 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -385,7 +385,7 @@ public class PlayerInteractManager {
@@ -199,7 +199,7 @@ index 1bfa7e5e6..4e4418032 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 22c47c63c..52e296d46 100644
+index 22c47c63c7..52e296d468 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -221,10 +221,10 @@ index 22c47c63c..52e296d46 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e05ad05a4..80941ab1a 100644
+index 8aa3ffdde0..a258e8208b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1210,7 +1210,7 @@ public class CraftWorld implements World {
+@@ -1215,7 +1215,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)) {
@@ -234,7 +234,7 @@ index e05ad05a4..80941ab1a 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d..3302af0e4 100644
+index 3a09cab3d4..3302af0e45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
diff --git a/Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index a0db44897d..9230433f9d 100644
--- a/Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 86f0ce9af4b1f511ed5fab9611a635fc128e46e1 Mon Sep 17 00:00:00 2001
+From d9df5e2df8f110eb54185d952813d68f0abd129a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -39,10 +39,10 @@ index ad9e7f7b54..0f00eecead 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e09f2f5b5f..8c7428c087 100644
+index fb0f77f1b3..450f045603 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1757,6 +1757,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1759,6 +1759,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          switch (packetplayinentityaction.c()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
diff --git a/Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch
index 6082215e93..55af85852b 100644
--- a/Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From d9a6d1fbf03dd21663d7bbb566f6b512c6566ade Mon Sep 17 00:00:00 2001
+From 3afc9e82754c1b48e6c2b9a34d03af445f290bad Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0a914974be..fe614e17f7 100644
+index c39e789529..8660387623 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 0a914974be..fe614e17f7 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1646,6 +1647,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1649,6 +1650,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index 0a914974be..fe614e17f7 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1793,6 +1798,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1796,6 +1801,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (!originTag.isEmpty()) {
                  origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
@@ -37,7 +37,7 @@ index 0a914974be..fe614e17f7 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index a62e34f7f9..ef93f433d6 100644
+index 02ec6b10f5..72b12d869e 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index ae705e86f9..4e818198b2 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
index b4e8e5e818..b14fc3d49d 100644
--- a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From 80c3e9f2c71f29c8d955b0fee18ee43a3290d0cc Mon Sep 17 00:00:00 2001
+From 11d11e3eb36a88359c91a8c569c2405f0b2e620f Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 504c9ad4..4ac310ba 100644
+index 504c9ad473..4ac310bae1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1476,6 +1476,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index 504c9ad4..4ac310ba 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8c7428c0..1294ce56 100644
+index 450f045603..3b02b6cb4d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -29,7 +29,7 @@ index 8c7428c0..1294ce56 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -874,7 +876,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -876,7 +878,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              d8 = d5 - this.p;
                              d9 = d6 - this.q;
                              if (this.player.onGround && !packetplayinflying.b() && d8 > 0.0D) {
@@ -66,5 +66,5 @@ index 8c7428c0..1294ce56 100644
  
                              this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0210-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0210-handle-PacketPlayInKeepAlive-async.patch
index 0d24d29426..e6272d9d98 100644
--- a/Spigot-Server-Patches/0210-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0210-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 34ac5d46abe3ec4ca621652fae24bda7726ce9b3 Mon Sep 17 00:00:00 2001
+From 00a785fd5b99aa73fa110a44779c77e92db675fa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 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 4cf738e0f8..66d7d76d41 100644
+index 3b02b6cb4d..bf2656c74f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2481,14 +2481,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2483,14 +2483,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -40,5 +40,5 @@ index 4cf738e0f8..66d7d76d41 100644
  
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
index f33d2b7155..ea394d2198 100644
--- a/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 3806e594908e80f896c219a698d1b57bd73c1ad3 Mon Sep 17 00:00:00 2001
+From cd39f3b42d334c383b0004ff9ae4466555b0f56f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 23c07ca5c..f8a47ceb9 100644
+index 7270638f4a..3e8db87b88 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -10,6 +10,7 @@ import io.netty.util.concurrent.Future;
@@ -25,7 +25,7 @@ index 23c07ca5c..f8a47ceb9 100644
  import java.util.Set;
  import java.util.function.Consumer;
  import javax.annotation.Nullable;
-@@ -507,10 +508,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -509,10 +510,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
@@ -38,7 +38,7 @@ index 23c07ca5c..f8a47ceb9 100644
              return;
          }
          // CraftBukkit end
-@@ -520,11 +521,57 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -522,11 +523,57 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              stringreader.skip();
          }
  
@@ -101,7 +101,7 @@ index 23c07ca5c..f8a47ceb9 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 74e466d1f..0e582e4e5 100644
+index 74e466d1f6..0e582e4e5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1719,7 +1719,7 @@ public final class CraftServer implements Server {
@@ -114,7 +114,7 @@ index 74e466d1f..0e582e4e5 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 1e3aae3b8..95d13c146 100644
+index 1e3aae3b8f..95d13c146b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
diff --git a/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 20fe7fdc68..bc11ccaeec 100644
--- a/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From 7e7b6875d33f889eb5f9833d99f4c87b1cbffa04 Mon Sep 17 00:00:00 2001
+From 7df86b0c44960ab5d8d080e15b8c4b7ea4ef30e2 Mon Sep 17 00:00:00 2001
 From: 0x22 <[email protected]>
 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 f8a47ceb9..4cdf79002 100644
+index 3e8db87b88..7c183ff6fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2519,7 +2519,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2521,7 +2521,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
@@ -18,5 +18,5 @@ index f8a47ceb9..4cdf79002 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.16.1.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
index 1b5572d24c..6882245c79 100644
--- a/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From db72f56ffcdae6836f009ca24d307d0f8ca95fba Mon Sep 17 00:00:00 2001
+From c92db259c1e28d3e3d400b4eeb750a0264b48ed5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 65fe50882..ee0645765 100644
+index 65fe50882b..ee06457653 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1206,12 +1206,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -34,10 +34,10 @@ index 65fe50882..ee0645765 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 80941ab1a..a7431110d 100644
+index a258e8208b..cb5efa6299 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1617,11 +1617,17 @@ public class CraftWorld implements World {
+@@ -1622,11 +1622,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) {
diff --git a/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index c1dc4f25d0..b6d5d03538 100644
--- a/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 02b0e01668f75480a706f28a6fafe385cc4f745c Mon Sep 17 00:00:00 2001
+From a368a9ed6908324170bfe87966b193729207fc9c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 a7431110d..45bb22218 100644
+index cb5efa6299..2db0742568 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -926,6 +926,10 @@ public class CraftWorld implements World {
+@@ -931,6 +931,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);
diff --git a/Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch
index 5e627c4b7a..1923d171c8 100644
--- a/Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 0aa57bc0915718eae312b2f975f65795fae8a1c1 Mon Sep 17 00:00:00 2001
+From 9dbe03fbbbdd8e2474e9f3d4ffc0b9852cf4af53 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,10 +22,10 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bc768e6a7f..a0eacf34d0 100644
+index 8660387623..347aef07d5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2591,7 +2591,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2594,7 +2594,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end */
  
@@ -35,7 +35,7 @@ index bc768e6a7f..a0eacf34d0 100644
              this.world.methodProfiler.a("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d6e330d345..3b3ace52b0 100644
+index ee06457653..b939c31b23 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1020,6 +1020,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -47,5 +47,5 @@ index d6e330d345..3b3ace52b0 100644
          this.entitiesById.d(entity.getId());
          this.entitiesByUUID.remove(entity.getUniqueID());
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0278-Expand-Explosions-API.patch b/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
index fc7035c940..c04d2e06c0 100644
--- a/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 08b93d0e0074418124b2d05c5fcdb65387b9bc04 Mon Sep 17 00:00:00 2001
+From 0ef3c404c567a437f2d54e5eb318a18b40f9d6e0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 45bb22218..a56459c81 100644
+index 2db0742568..da141748bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -538,6 +538,11 @@ public class CraftWorld implements World {
+@@ -543,6 +543,11 @@ public class CraftWorld implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
          return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
      }
diff --git a/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
index 1534e50bf3..57058a20e3 100644
--- a/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From 14498ad26f17e0a00a013d79a3448cd9f9ac7a8d Mon Sep 17 00:00:00 2001
+From 67453c9fb500929405b644d43da1bbff6528a928 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 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 a56459c81..74f09ac45 100644
+index da141748bd..b37864e2b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -746,6 +746,14 @@ public class CraftWorld implements World {
+@@ -751,6 +751,14 @@ public class CraftWorld implements World {
          return list;
      }
  
diff --git a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch
index 4d7dd67dda..237113a1af 100644
--- a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From f144da0f68e58501c0d831f61b0838312688b069 Mon Sep 17 00:00:00 2001
+From 94a46fefc0d5a307953ae1c8b73a174484981330 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,10 +7,10 @@ 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ca6107a5af..9f2a08b03d 100644
+index a8705776a6..36f4231427 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -894,7 +894,7 @@ public class Chunk implements IChunkAccess {
+@@ -906,7 +906,7 @@ public class Chunk implements IChunkAccess {
                  {
                      if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                      {
@@ -19,7 +19,7 @@ index ca6107a5af..9f2a08b03d 100644
                      }
                  }
              }
-@@ -919,7 +919,7 @@ public class Chunk implements IChunkAccess {
+@@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
                      {
                          if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                          {
@@ -110,10 +110,10 @@ index 3644fde3bb..68f5842cfe 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4cdf790029..793174c51b 100644
+index 7c183ff6fa..7704a2bc6a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2055,7 +2055,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2057,7 +2057,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
diff --git a/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index d70c5d74d7..c7e44ff9f3 100644
--- a/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From a23864b85e6201765fe2814e9a455a1a656c92eb Mon Sep 17 00:00:00 2001
+From 3f1126300352795e952d6784a67e50ea1e18b456 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 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 793174c51..f8ffc5832 100644
+index 7704a2bc6a..ff2f3d9971 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1969,6 +1969,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1971,6 +1971,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      }
  
                      if (event.isCancelled()) {
@@ -28,5 +28,5 @@ index 793174c51..f8ffc5832 100644
                      }
                      // CraftBukkit end
 -- 
-2.16.1.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch
index b6f39c2f00..26ff6f786b 100644
--- a/Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From a87c697c5e33dcac78e007298ab76eca1b1977c2 Mon Sep 17 00:00:00 2001
+From ac603b982b9f06e915b58593d719849c2223096e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a0eacf34d0..064bd4133a 100644
+index 347aef07d5..42c1c47c58 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2494,7 +2494,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2497,7 +2497,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
@@ -19,5 +19,5 @@ index a0eacf34d0..064bd4133a 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch
index 83b1ee99bf..e7af4ab553 100644
--- a/Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From a18e6adce72a0abc1cf6d290a75a10e6409cf00c Mon Sep 17 00:00:00 2001
+From 8f520dfcfc935c3a5e6fba1d4e9d6d10192bfadd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -85,7 +85,7 @@ index 99986bac97..1bfa9ad567 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 83e9c97873..518e246569 100644
+index 91684b4fe9..0c27b90183 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -115,7 +115,7 @@ index 83e9c97873..518e246569 100644
          }
  
          int k = MathHelper.floor(entity.locY / 16.0D);
-@@ -863,6 +870,51 @@ public class Chunk implements IChunkAccess {
+@@ -875,6 +882,51 @@ public class Chunk implements IChunkAccess {
  
          for (int j = 0; j < i; ++j) {
              List entityslice = aentityslice[j]; // Spigot
@@ -168,10 +168,10 @@ index 83e9c97873..518e246569 100644
              this.world.a(entityslice.stream().filter((entity) -> {
                  return !(entity instanceof EntityHuman);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7d8f723968..46399cc9b0 100644
+index 3606c78843..57adaf2a4c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2719,6 +2719,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2722,6 +2722,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
diff --git a/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch
deleted file mode 100644
index ff0bd5ce10..0000000000
--- a/Spigot-Server-Patches/0300-Add-async-chunk-load-API.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dbf563359289ee3bddce540d2ee7ef2b209711b5 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Sat, 21 Jul 2018 16:55:04 -0400
-Subject: [PATCH] Add async chunk load API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 74f09ac45..0c83a070f 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -157,6 +157,18 @@ public class CraftWorld implements World {
-         }
-     }
- 
-+    // Paper start - Async chunk load API
-+    @Override
-+    public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(final int x, final int z, final boolean gen) {
-+        final ChunkProviderServer cps = this.world.getChunkProviderServer();
-+        java.util.concurrent.CompletableFuture<Chunk> future = new java.util.concurrent.CompletableFuture<>();
-+        net.minecraft.server.Chunk chunk = cps.getChunkAt(x, z, true, gen);
-+        // TODO: Add back async variant
-+        future.complete(chunk != null ? chunk.bukkitChunk : null);
-+        return future;
-+    }
-+    // Paper end
-+
-     public Chunk getChunkAt(int x, int z) {
-         return this.world.getChunkProviderServer().getChunkAt(x, z, true, true).bukkitChunk;
-     }
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0301-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0300-Speedup-BlockPos-by-fixing-inlining.patch
index 39b809756a..f70afaa666 100644
--- a/Spigot-Server-Patches/0301-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0300-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 7ea14626e7aa995df770fe5bfb91e6a8cbb3b9b0 Mon Sep 17 00:00:00 2001
+From ed96918de0d813b82c67db2fc245376bd51d51f6 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -202,5 +202,5 @@ index 1dfd71df0a..986b1e13a5 100644
  
          public BlockPosition toBlockPosition() { return h(); } // Paper - OBFHELPER
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0302-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0301-Don-t-save-Proto-Chunks.patch
index 5c7cf86f69..e49c12f4e0 100644
--- a/Spigot-Server-Patches/0302-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0301-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From d15c2067a5b8cb216de1effc12c85f838d1d7cf6 Mon Sep 17 00:00:00 2001
+From 627b7140147b526cb50653b9d53cf01a120b7d07 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -8,10 +8,10 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f099b91f7a..ec94b9fe57 100644
+index ec328126cf..3d8f0b5786 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -296,6 +296,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -300,6 +300,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      public void saveChunk(World world, IChunkAccess ichunkaccess, boolean unloaded) throws IOException, ExceptionWorldConflict {
@@ -41,5 +41,5 @@ index 22af9c1885..95eb1a84ac 100644
  
          synchronized (this.e) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0303-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0302-Optimize-RegistryID.c.patch
index be789afe5f..b0b37f0733 100644
--- a/Spigot-Server-Patches/0303-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0302-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From b30fb91663c75adb7a5138e6f03a70c63d93c0f6 Mon Sep 17 00:00:00 2001
+From d7257593d68d82a105f007a16dcae0bf82374bf2 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <[email protected]>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -64,5 +64,5 @@ index d03ac0e70c..9242999f70 100644
  
      public int b() {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0304-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0303-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index efa07f87de..6e390b4045 100644
--- a/Spigot-Server-Patches/0304-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0303-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 4708d049575f974711c0a89dac7fd5d9d09e2b7f Mon Sep 17 00:00:00 2001
+From 709c949dabcbe200d9ee126d166bba74d1a92df1 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
diff --git a/Spigot-Server-Patches/0305-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0304-Vanished-players-don-t-have-rights.patch
index c6079ed768..afc85275fb 100644
--- a/Spigot-Server-Patches/0305-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0304-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 84cd96aafcb42e4829f7fa42f2a6ac41c4832652 Mon Sep 17 00:00:00 2001
+From 725923a7b4616817e6dec0b439ca574f74878467 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 46399cc9b0..fdc9d96c27 100644
+index 57adaf2a4c..0381f8e658 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -94,7 +94,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0306-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0305-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index aad13bbe7e..aab0809e81 100644
--- a/Spigot-Server-Patches/0306-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0305-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 00d7ab0e1fdd32d6d3f1465e36456f533d0763e9 Mon Sep 17 00:00:00 2001
+From c191218c2bde350f0acd631afc48995a0048a67b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 91049ed20f..66712db2a2 100644
+index 0c27b90183..a1ccabda6d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -712,6 +712,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0307-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0306-Add-some-Debug-to-Chunk-Entity-slices.patch
index 45f59e4527..22a10e6342 100644
--- a/Spigot-Server-Patches/0307-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0306-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 01a7a706b556bb48887a2e4cf43852373a54619c Mon Sep 17 00:00:00 2001
+From 22874f0f44ef4a0a9518b649e398e62bddc004aa Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 66712db2a2..39cbde281b 100644
+index a1ccabda6d..18faa52d41 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -710,8 +710,34 @@ public class Chunk implements IChunkAccess {
@@ -64,7 +64,7 @@ index 66712db2a2..39cbde281b 100644
          this.markDirty();
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
-@@ -980,6 +1010,7 @@ public class Chunk implements IChunkAccess {
+@@ -992,6 +1022,7 @@ public class Chunk implements IChunkAccess {
                  }
                  // Spigot End
                  entity.setCurrentChunk(null); // Paper
@@ -73,7 +73,7 @@ index 66712db2a2..39cbde281b 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fdc9d96c27..8951ac8095 100644
+index 0381f8e658..965cd592f3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -64,6 +64,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0308-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0307-Optimize-Region-File-Cache.patch
index f738830685..a9cc9e0f37 100644
--- a/Spigot-Server-Patches/0308-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0307-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From c033b7ac3b55f3523700a96a450368327b68c2d9 Mon Sep 17 00:00:00 2001
+From 2ec638b622c01b61fd6d67d43fc566c42e66b9b8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 23:40:04 -0400
 Subject: [PATCH] Optimize Region File Cache
@@ -63,5 +63,5 @@ index c0ab543b91..15666325ea 100644
  
          return regionfile != null ? regionfile.d(i & 31, j & 31) : false;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0309-EntityTransformedEvent.patch b/Spigot-Server-Patches/0308-EntityTransformedEvent.patch
index 4272912b73..e6214bc1a7 100644
--- a/Spigot-Server-Patches/0309-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0308-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From a088adbba3accae04e91e53618a5a71edb2b3c7f Mon Sep 17 00:00:00 2001
+From 77674401169a1e811c87a180492e4b682dae7cb8 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <[email protected]>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
@@ -18,7 +18,7 @@ index 5b856aea2f..13a6ddac59 100644
  
                  for (int i = 0; i < 5; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 8fe68c2eb4..3b5d95945a 100644
+index e37fca5b12..62bb51104d 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -623,7 +623,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -65,5 +65,5 @@ index bf136a6aa3..94bd3c5b37 100644
          if (this.bD != null) {
              EntityHuman entityhuman = this.world.b(this.bD);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0310-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0309-SkeletonHorse-Additions.patch
index ab0f7860f5..5ab383b06c 100644
--- a/Spigot-Server-Patches/0310-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0309-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From 4d96f10c728379d6569099d30c3b52c9f25901fa Mon Sep 17 00:00:00 2001
+From f131c3e9f7448f2ce5b058b39f4250e6a3fc270e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
@@ -31,7 +31,7 @@ index e3690db471..ba6c0e96a3 100644
          if (flag != this.bN) {
              this.bN = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 82403c8165..2ee91bbb02 100644
+index a6979fe859..d4fdcbdfd6 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -71,5 +71,5 @@ index e822c2200d..496d0c0cac 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0311-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0310-Prevent-Saving-Bad-entities-to-chunks.patch
index 37bebfbf25..db34e0ca8e 100644
--- a/Spigot-Server-Patches/0311-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0310-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 2ce2482dd23320d7c859438ade4fe2346ae1290c Mon Sep 17 00:00:00 2001
+From fb88b169444615df90c320481befdc3309aea0cd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,10 +18,10 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 4f9be4b86d..f22532f071 100644
+index 3d8f0b5786..db5c6e0f74 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -559,11 +559,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -563,11 +563,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
          Iterator iterator;
  
@@ -44,7 +44,7 @@ index 4f9be4b86d..f22532f071 100644
                  NBTTagCompound nbttagcompound1 = new NBTTagCompound();
  
                  if (entity.d(nbttagcompound1)) {
-@@ -572,6 +583,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -576,6 +587,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -57,5 +57,5 @@ index 4f9be4b86d..f22532f071 100644
          nbttagcompound.set("Entities", nbttaglist1);
          NBTTagList nbttaglist2 = new NBTTagList();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0312-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0311-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 26f34c15f6..23fc195324 100644
--- a/Spigot-Server-Patches/0312-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0311-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 945bdf171a8349bce6b68345835351323d8e35a5 Mon Sep 17 00:00:00 2001
+From 79081a523e2a4efbda4684d02761d8a33681daf5 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index d6e6b9bed..3966769c5 100644
+index d6e6b9bed4..3966769c5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -525,7 +525,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index d6e6b9bed..3966769c5 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index ef9d40b8a..a16199387 100644
+index ef9d40b8a0..a161993876 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.*;
@@ -84,5 +84,5 @@ index ef9d40b8a..a16199387 100644
      public void testBlockStateMeta() {
          List<Block> queue = new ArrayList<>();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0313-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0312-Always-process-chunk-removal-in-removeEntity.patch
index f2c37cb12e..f242ccd889 100644
--- a/Spigot-Server-Patches/0313-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0312-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From b2ff0d1f1033ce1fd4b2f4ff692817b76d5ccaeb Mon Sep 17 00:00:00 2001
+From ccb19883a20710b960cf3eb6e1e4d190e94b3116 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 28 Jul 2018 12:09:20 -0400
 Subject: [PATCH] Always process chunk removal in removeEntity
diff --git a/Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0313-Ignore-Dead-Entities-in-entityList-iteration.patch
index 82b1f31fa9..8db2f3a93c 100644
--- a/Spigot-Server-Patches/0314-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0313-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From ec44d5b28d7c2c7810a846ef99da871b9ce244af Mon Sep 17 00:00:00 2001
+From 5feff7d866b455244eca6f48ec55c5afeb16706a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 56700fc59..9b9c8361e 100644
+index 56700fc596..9b9c8361e9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index 56700fc59..9b9c8361e 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8951ac809..127a7c9b7 100644
+index 965cd592f3..1dd56aec38 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 8951ac809..127a7c9b7 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 597169b4c..b18ea7154 100644
+index 597169b4cc..b18ea7154f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1111,6 +1111,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -71,10 +71,10 @@ index 597169b4c..b18ea7154 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0c83a070f..30ca72297 100644
+index b37864e2b8..52d36052b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -645,6 +645,7 @@ public class CraftWorld implements World {
+@@ -638,6 +638,7 @@ public class CraftWorld implements World {
          for (Object o : world.entityList) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -82,7 +82,7 @@ index 0c83a070f..30ca72297 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -663,6 +664,7 @@ public class CraftWorld implements World {
+@@ -656,6 +657,7 @@ public class CraftWorld implements World {
          for (Object o : world.entityList) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -90,7 +90,7 @@ index 0c83a070f..30ca72297 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -687,6 +689,7 @@ public class CraftWorld implements World {
+@@ -680,6 +682,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entityList) {
              if (entity instanceof net.minecraft.server.Entity) {
@@ -98,7 +98,7 @@ index 0c83a070f..30ca72297 100644
                  Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
  
                  if (bukkitEntity == null) {
-@@ -709,6 +712,7 @@ public class CraftWorld implements World {
+@@ -702,6 +705,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entityList) {
              if (entity instanceof net.minecraft.server.Entity) {
diff --git a/Spigot-Server-Patches/0316-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0314-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index dfe6adf7cd..91102b4f74 100644
--- a/Spigot-Server-Patches/0316-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0314-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 5696f5658ba8b4da0887128327f22533fe32fc47 Mon Sep 17 00:00:00 2001
+From 555c8cf7825f78ffad6d0fb864f494b6bb8ca61b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -59,10 +59,10 @@ index 72602be58a..85b74994aa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f22532f071..7db075b731 100644
+index db5c6e0f74..b6ec518371 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -59,8 +59,63 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -59,8 +59,55 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      private PersistentStructureLegacy e;
      // private boolean f; // CraftBukkit
      private static final double SAVE_QUEUE_TARGET_SIZE = 625; // Spigot
@@ -93,14 +93,6 @@ index f22532f071..7db075b731 100644
 +            }
 +        }
 +    }
-+
-+    public boolean chunkExists(int x, int z) {
-+        if (this.saveMap.containsKey(ChunkCoordIntPair.asLong(x, z))) {
-+            return true;
-+        }
-+        copyIfNeeded(x, z);
-+        return RegionFileCache.chunkExists(this.actualWorld, x, z);
-+    }
 +    // Paper end
  
      public ChunkRegionLoader(File file, DataFixer datafixer) {
@@ -126,16 +118,19 @@ index f22532f071..7db075b731 100644
          this.c = file;
          this.d = datafixer;
      }
-@@ -79,7 +134,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-             }
-         }
+@@ -98,11 +145,18 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+     }
  
--        if (RegionFileCache.chunkExists(this.c, x, z)) {
-+        if (chunkExists(x, z)) { // Paper
-             NBTTagCompound nbt = RegionFileCache.read(this.c, x, z);
-             if (nbt != null) {
-                 NBTTagCompound level = nbt.getCompound("Level");
-@@ -99,6 +154,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+     public boolean chunkExists(int x, int z) {
+-        return RegionFileCache.chunkExists(this.c, x, z);
++        // Paper start
++        if (this.saveMap.containsKey(ChunkCoordIntPair.asLong(x, z))) {
++            return true;
++        }
++        copyIfNeeded(x, z);
++        return RegionFileCache.chunkExists(this.actualWorld, x, z);
++        // Paper end
+     }
  
      @Nullable
      private NBTTagCompound a(DimensionManager dimensionmanager, @Nullable PersistentCollection persistentcollection, int i, int j, @Nullable GeneratorAccess generatoraccess) throws IOException {
diff --git a/Spigot-Server-Patches/0315-Always-process-chunk-registration-after-moving.patch b/Spigot-Server-Patches/0315-Always-process-chunk-registration-after-moving.patch
deleted file mode 100644
index 8eff1880c0..0000000000
--- a/Spigot-Server-Patches/0315-Always-process-chunk-registration-after-moving.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 45c2e68e9628f6f94d284c5c84138f928f112aad Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Sun, 29 Jul 2018 11:58:05 -0400
-Subject: [PATCH] Always process chunk registration after moving
-
-This will help guarantee that entities are always in the
-chunk that they are currently located at.
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e558197623..f5e66aaf90 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -341,6 +341,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-         this.locX = d0;
-         this.locY = d1;
-         this.locZ = d2;
-+        if (valid) world.entityJoinedWorld(this, false); // Paper - ensure Entity is moved to its proper chunk
-         float f = this.width / 2.0F;
-         float f1 = this.length;
- 
-@@ -935,6 +936,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-         this.locX = (axisalignedbb.a + axisalignedbb.d) / 2.0D;
-         this.locY = axisalignedbb.b;
-         this.locZ = (axisalignedbb.c + axisalignedbb.f) / 2.0D;
-+        if (valid) world.entityJoinedWorld(this, false); // Paper - ensure Entity is moved to its proper chunk
-     }
- 
-     protected SoundEffect ad() {
-diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
-index f2d3d0b4c7..f20060614d 100644
---- a/src/main/java/net/minecraft/server/EntityLeash.java
-+++ b/src/main/java/net/minecraft/server/EntityLeash.java
-@@ -31,6 +31,7 @@ public class EntityLeash extends EntityHanging {
-         this.locX = (double) this.blockPosition.getX() + 0.5D;
-         this.locY = (double) this.blockPosition.getY() + 0.5D;
-         this.locZ = (double) this.blockPosition.getZ() + 0.5D;
-+        if (valid) world.entityJoinedWorld(this, false); // Paper - ensure Entity is moved to its proper chunk
-     }
- 
-     public void setDirection(EnumDirection enumdirection) {}
-diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 24de5f0172..06e51d5b81 100644
---- a/src/main/java/net/minecraft/server/EntityShulker.java
-+++ b/src/main/java/net/minecraft/server/EntityShulker.java
-@@ -385,6 +385,7 @@ public class EntityShulker extends EntityGolem implements IMonster {
-                 this.locX = (double) blockposition.getX() + 0.5D;
-                 this.locY = (double) blockposition.getY();
-                 this.locZ = (double) blockposition.getZ() + 0.5D;
-+                if (valid) world.entityJoinedWorld(this, false); // Paper - ensure Entity is moved to its proper chunk
-                 this.lastX = this.locX;
-                 this.lastY = this.locY;
-                 this.lastZ = this.locZ;
--- 
-2.18.0
-
diff --git a/Spigot-Server-Patches/0317-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0315-MC-111480-Start-Entity-ID-s-at-1.patch
index 2a986fffbf..d5bdb1f3fd 100644
--- a/Spigot-Server-Patches/0317-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0315-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 0ee43fd09448733a29c41dcb66161b63b0c4f5b3 Mon Sep 17 00:00:00 2001
+From a6cc211cabcde63d81a1d739bd51a70cdb39648f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f5e66aaf90..7b07fe1990 100644
+index 1dd56aec38..1554530966 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index f5e66aaf90..7b07fe1990 100644
      private int id;
      public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0318-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0316-Implement-Expanded-ArmorStand-API.patch
index bf8934d3ea..64becd7105 100644
--- a/Spigot-Server-Patches/0318-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0316-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 7450cf5daad9de361e9b12a6a5c26bb9ddfae332 Mon Sep 17 00:00:00 2001
+From 2fd3f99debda330db60ff562f7215b90a4309836 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -126,5 +126,5 @@ index 124c3185bc..9f5c3b92e3 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0319-AnvilDamageEvent.patch b/Spigot-Server-Patches/0317-AnvilDamageEvent.patch
index e3e6868250..d0c5a34278 100644
--- a/Spigot-Server-Patches/0319-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0317-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From f5e36a5efb5e916787352dc928206fb436e943cf Mon Sep 17 00:00:00 2001
+From f85ac6e7ed0e5011b40cbabeff227f9bce5a523d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
@@ -26,5 +26,5 @@ index f2e15fa545..96fcd35bfe 100644
                          if (iblockdata1 == null) {
                              world.setAir(blockposition);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0320-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0318-World-EntityHuman-Lookup-Optimizations.patch
index c86516978e..caa402418a 100644
--- a/Spigot-Server-Patches/0320-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0318-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,4 +1,4 @@
-From 3b72e7847d2396655fb55ffa0e2d70a475e71977 Mon Sep 17 00:00:00 2001
+From b4a0ee91b6438d5bd1f2d92aee64a4a6fded636c Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Mon, 30 Jul 2018 02:42:49 -0400
 Subject: [PATCH] World EntityHuman Lookup Optimizations
diff --git a/Spigot-Server-Patches/0321-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0319-Add-TNTPrimeEvent.patch
index d2189b3735..d793ce8895 100644
--- a/Spigot-Server-Patches/0321-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0319-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From 9227efe8d5f87f4f0fb0e99a16833f62531808dc Mon Sep 17 00:00:00 2001
+From 024c7585d9b1e74bf5c4b2a7dde0701b3af2e948 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -136,5 +136,5 @@ index 2c735a920d..74d96a2f09 100644
  
                  this.world.setAir(new BlockPosition(blockX, blockY, blockZ));
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0320-Break-up-and-make-tab-spam-limits-configurable.patch
index bc9abafbee..11cbacd158 100644
--- a/Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0320-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From dd280bda23d6e9be15ab2f08c95a5520fe2d876b Mon Sep 17 00:00:00 2001
+From 882081cb9d7769ecc69139be766947f0221118bc Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -45,7 +45,7 @@ index 85b74994aa..f74148b8a3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f8ffc58326..452c279708 100644
+index ff2f3d9971..7768b5898a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -78,6 +78,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -64,7 +64,7 @@ index f8ffc58326..452c279708 100644
          /* Use thread-safe field access instead
          if (this.chatThrottle > 0) {
              --this.chatThrottle;
-@@ -510,7 +512,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -512,7 +514,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
          // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
diff --git a/Spigot-Server-Patches/0323-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0321-Make-portal-teleportation-adjustment-math-more-accur.patch
index ec6271b35e..71e877374e 100644
--- a/Spigot-Server-Patches/0323-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0321-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,4 +1,4 @@
-From 505af35b52f62cdda8013adee6a920ce82b2b5d4 Mon Sep 17 00:00:00 2001
+From 75bb97425391159e71032182e3494bc19bae3f65 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 31 Jul 2018 19:32:57 -0500
 Subject: [PATCH] Make portal teleportation adjustment math more accurate
@@ -91,5 +91,5 @@ index 0c9910d9a5..446cdb86d8 100644
              return this.e;
          }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0324-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0322-Add-hand-to-bucket-events.patch
index d4ef6b8f45..a273559541 100644
--- a/Spigot-Server-Patches/0324-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0322-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From dcebaefd1b38c02ae40710ee69b1a420cc5fa34f Mon Sep 17 00:00:00 2001
+From 8692b36f4d2a24595ddc5e031f2e2d7ae6caa2a8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5f4f107d5..b2e50f853 100644
+index 5f4f107d5a..b2e50f8532 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -65,7 +65,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 5f4f107d5..b2e50f853 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index b63da7151..b0dd30dd1 100644
+index b63da71512..b0dd30dd12 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -35,7 +35,7 @@ public class ItemBucket extends Item {
@@ -67,7 +67,7 @@ index b63da7151..b0dd30dd1 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          // TODO: inventory not updated
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 77c6c0ec1..a553c2065 100644
+index 77c6c0ec16..a553c20657 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -169,6 +169,20 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0325-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0323-MC-135506-Experience-should-save-as-Integers.patch
index 9bcf24f7b4..fd11dd3dfc 100644
--- a/Spigot-Server-Patches/0325-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0323-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,4 +1,4 @@
-From 653015c30b67e491a1472ccac1a88a0fedf26eb1 Mon Sep 17 00:00:00 2001
+From 37946bb90997fbe0bfffebd99822da5466c9e2ed Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
@@ -26,5 +26,5 @@ index 53cfc10017..904c6e1a7d 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0326-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0324-Entity-add-to-world-fixes.patch
index f0059019b0..b8b8addf93 100644
--- a/Spigot-Server-Patches/0326-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0324-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From ae23abdc7f17c83315f4b81e56103f73235179f6 Mon Sep 17 00:00:00 2001
+From 5fda497be64e89c51ec700b001432f858a870a19 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
@@ -14,10 +14,10 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 39cbde281b..4a39461eb2 100644
+index 18faa52d41..3be0a18a0a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -899,6 +899,7 @@ public class Chunk implements IChunkAccess {
+@@ -911,6 +911,7 @@ public class Chunk implements IChunkAccess {
          this.world.a(this.tileEntities.values());
          List[] aentityslice = this.entitySlices; // Spigot
          int i = aentityslice.length;
@@ -25,7 +25,7 @@ index 39cbde281b..4a39461eb2 100644
  
          for (int j = 0; j < i; ++j) {
              List entityslice = aentityslice[j]; // Spigot
-@@ -946,12 +947,11 @@ public class Chunk implements IChunkAccess {
+@@ -958,12 +959,11 @@ public class Chunk implements IChunkAccess {
                      thisChunk.put(entity.uniqueID, entity);
                  }
              }
diff --git a/Spigot-Server-Patches/0327-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0325-Fix-client-rendering-skulls-from-same-user.patch
index 0c2bb29cdf..cd64d629d2 100644
--- a/Spigot-Server-Patches/0327-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0325-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From f86adbbb5a758faffc7a2997a10a31462a80b381 Mon Sep 17 00:00:00 2001
+From 2a842c4256ab5b3c55a76ac3902a7c9cb7062b27 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -117,5 +117,5 @@ index e59f3c21d7..05fca47f34 100644
  
      public NBTTagCompound aa_() {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0328-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0326-Add-Early-Warning-Feature-to-WatchDog.patch
index ad726dcb9d..e6feb8cf6f 100644
--- a/Spigot-Server-Patches/0328-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0326-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From b76e219243a1d9ebd0c6c4100299dc176319d70e Mon Sep 17 00:00:00 2001
+From 23509e56cd0adf47b57de8998a95cd9b47af0e10 Mon Sep 17 00:00:00 2001
 From: miclebrick <[email protected]>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
diff --git a/Spigot-Server-Patches/0329-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0327-Make-EnderDragon-implement-Mob.patch
index 87f74cdf09..735bfca076 100644
--- a/Spigot-Server-Patches/0329-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0327-Make-EnderDragon-implement-Mob.patch
@@ -1,4 +1,4 @@
-From 4828bc789a5e2bc611a4326fda55a39d2d8753a1 Mon Sep 17 00:00:00 2001
+From 937febe97159acedb73ae99fcd77dce55e758bb4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
@@ -32,5 +32,5 @@ index cc115cc368..4947249da2 100644
  
      @Override
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0330-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0328-Detect-and-repair-corrupt-Region-Files.patch
index e32d5c8f79..119ed149e4 100644
--- a/Spigot-Server-Patches/0330-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0328-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From e232364bbe6742e92b63345842d63483cdcfe77f Mon Sep 17 00:00:00 2001
+From a78afbc2ce603e2addfd54b8614758bf400077fe Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files
@@ -37,5 +37,5 @@ index 5d2853b9ce..c35974aa7c 100644
                  this.c.write(a);
                  this.g += 8192;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0331-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0329-Use-ConcurrentHashMap-in-JsonList.patch
index 4e03c6dca6..fd9f0671f6 100644
--- a/Spigot-Server-Patches/0331-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0329-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 834bc0ee635f4f0a3bc44e22c3865a91bb3985cf Mon Sep 17 00:00:00 2001
+From 6da557ad9a1a07c2b3a019f229c243ac252882c9 Mon Sep 17 00:00:00 2001
 From: egg82 <[email protected]>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -101,5 +101,5 @@ index 6700e68c06..a2815b91fd 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0332-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0330-Use-a-Queue-for-Queueing-Commands.patch
index 150864e1d9..3d8c73c662 100644
--- a/Spigot-Server-Patches/0332-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0330-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 92ce659d44507fca507ace7feb482e5742a887ca Mon Sep 17 00:00:00 2001
+From 8cf82461ddd5c4898297f465ff4b7d24ff409116 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 1a332909b..9ad5d9dc6 100644
+index 1a332909b2..9ad5d9dc60 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0333-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0331-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 80b059725b..0e8b90b85f 100644
--- a/Spigot-Server-Patches/0333-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0331-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From c9264f8c58b0da91bead0c09f1768e39b26501c8 Mon Sep 17 00:00:00 2001
+From f03d2efe67fdb18e52f82d689a34b3a965ccb252 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
@@ -31,5 +31,5 @@ index 76d395c4ed..12c6d850d2 100644
  
          return entities;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0332-Allow-disabling-armour-stand-ticking.patch
index 9f8c6dc47b..fc963a951f 100644
--- a/Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0332-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From cb2191edaefcdf7ba434fd69ddb5ac89c7da746d Mon Sep 17 00:00:00 2001
+From f999fc0ab505fe2f95cbfce2b39434e798eb7141 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/Spigot-Server-Patches/0336-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0333-Optimize-BlockPosition-helper-methods.patch
index 3719481811..1959707264 100644
--- a/Spigot-Server-Patches/0336-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0333-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 3c8e36e09accde296da36b77e7e82967d7dc80f1 Mon Sep 17 00:00:00 2001
+From 1fe6a44f34257dde4d9c480011acd97f90ae516e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -121,5 +121,5 @@ index 986b1e13a5..45f7794613 100644
  
      public BlockPosition a(EnumBlockRotation enumblockrotation) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0334-Send-nearby-packets-from-world-player-list-not-serve.patch
index 7b38f0a21a..dc6620b5d0 100644
--- a/Spigot-Server-Patches/0337-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0334-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From d68d17ef949cfb143bfdddd42e196b7e7875ff4d Mon Sep 17 00:00:00 2001
+From 97984d4ca59b2676ef7dd55e8c34da033c6e6c13 Mon Sep 17 00:00:00 2001
 From: Mystiflow <[email protected]>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6d511b623..d8eb2e986 100644
+index 6d511b6230..d8eb2e9864 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1201,8 +1201,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 6d511b623..d8eb2e986 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index e26405d34..23f390c22 100644
+index e26405d341..23f390c221 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
 @@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@@ -95,7 +95,7 @@ index e26405d34..23f390c22 100644
              if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                  double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 911d03c70..f837e6c36 100644
+index 911d03c70b..f837e6c36c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1086,7 +1086,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,10 +119,10 @@ index 911d03c70..f837e6c36 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 30ca72297..e6c2849a7 100644
+index 52d36052b2..8565de51f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1504,7 +1504,7 @@ public class CraftWorld implements World {
+@@ -1497,7 +1497,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);
diff --git a/Spigot-Server-Patches/0338-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0335-Cache-World-Entity-Type-counts.patch
index 14e874bfa6..0b7658fb5c 100644
--- a/Spigot-Server-Patches/0338-Cache-World-Entity-Type-counts.patch
+++ b/Spigot-Server-Patches/0335-Cache-World-Entity-Type-counts.patch
@@ -1,4 +1,4 @@
-From 9baa8594c726c12cde2138f825f10fc4b71e5eed Mon Sep 17 00:00:00 2001
+From 910f2676375b4a5af9294bfd15bcc469d2755350 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <[email protected]>
 Date: Wed, 8 Aug 2018 10:10:06 -0600
 Subject: [PATCH] Cache World Entity Type counts
@@ -133,7 +133,7 @@ index 0000000000..35104542c5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 02b567d559..f609e2ceda 100644
+index 1554530966..4007f1ebb7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -124,6 +124,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch b/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch
deleted file mode 100644
index 51c2cb9168..0000000000
--- a/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 19265f90b53f78867e779c8cea4b237694e462d3 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Thu, 16 Aug 2018 17:36:41 -0400
-Subject: [PATCH] Ensure chunks are always loaded on hard position sets
-
-Player Movement, Entity Creation and Teleportation move
-entities with a very "You are here, no debate" change, making
-the server register them as there, regardless if that chunk was
-loaded or not.
-
-It appears possible that with hack clients and lag, a player
-may be able to move fast enough to move into an unloaded
-chunk and get into a buggy state.
-
-To prevent this, we will ensure a chunk is always loaded,
-guaranteeing that the entity will be properly registered
-into its new home comfortably.
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2f87439c47..4252e8c02a 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1364,6 +1364,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             this.lastYaw -= 360.0F;
-         }
- 
-+        world.getChunkAt((int) Math.floor(this.locX) >> 4, (int) Math.floor(this.locZ) >> 4); // Paper - ensure chunk is always loaded
-         this.setPosition(this.locX, this.locY, this.locZ);
-         this.setYawPitch(f, f1);
-     }
--- 
-2.18.0
-
diff --git a/Spigot-Server-Patches/0339-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0336-Restore-vanlla-default-mob-spawn-range.patch
index c2a6109c4c..c3c210a843 100644
--- a/Spigot-Server-Patches/0339-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0336-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,4 +1,4 @@
-From c9a8b3125c4f51af38c75e34f3913eab6bcf1e5e Mon Sep 17 00:00:00 2001
+From 37a3f37597bf66aa1b233d29e56940215061d706 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
@@ -18,5 +18,5 @@ index 87bc8e2d9c..d2942fd8e7 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0340-Optimize-Hoppers.patch b/Spigot-Server-Patches/0337-Optimize-Hoppers.patch
index 43db87383c..005714f1f0 100644
--- a/Spigot-Server-Patches/0340-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0337-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From ff79abe5d00ee2187b3c32043b88383781c5fadc Mon Sep 17 00:00:00 2001
+From 5fc23486add9cb6e4300cd928ec7542b90badbeb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-Server-Patches/0341-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0338-Optimize-CraftBlockData-Creation.patch
index 3ec2c05ead..b03573589d 100644
--- a/Spigot-Server-Patches/0341-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0338-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 753b7c381064ecb7032ce34071112dd871ddbc6b Mon Sep 17 00:00:00 2001
+From eda4e5cc46dd7581de017e16bc4002f3ed10b5a6 Mon Sep 17 00:00:00 2001
 From: miclebrick <[email protected]>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -69,5 +69,5 @@ index d470e2b34a..b9279d925c 100644
      }
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0342-Fix-MC-124320.patch b/Spigot-Server-Patches/0339-Fix-MC-124320.patch
index 8318821e7d..775219da14 100644
--- a/Spigot-Server-Patches/0342-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0339-Fix-MC-124320.patch
@@ -1,4 +1,4 @@
-From b8b28dd95e1878ec15ffca803089743c286a8636 Mon Sep 17 00:00:00 2001
+From 65ac97e183c52ccbe7e0f9f3153f7966c43a2d06 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
@@ -49,5 +49,5 @@ index e5ccd29a08..9116e52911 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1)) {
                  // CraftBukkit start - Place event
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0343-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0340-Slime-Pathfinder-Events.patch
index 46b7374742..545aeeec07 100644
--- a/Spigot-Server-Patches/0343-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0340-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From 7c02c49425ecd113d16d1bcb93a0efc80f407877 Mon Sep 17 00:00:00 2001
+From bb7584b6f00163c9be56a5530997a936c53219f9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
@@ -134,5 +134,5 @@ index 18e7ef80ac..8403c1e01c 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0345-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-Server-Patches/0341-Add-source-block-to-BlockPhysicsEvent.patch
index f499a07ebe..9e28df6be1 100644
--- a/Spigot-Server-Patches/0345-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-Server-Patches/0341-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,4 +1,4 @@
-From ef21b6d2fc86771ebcc7af33e97e1b952731235f Mon Sep 17 00:00:00 2001
+From 478ed3a7a3ea26de8743a0f93b15d16372a5aee3 Mon Sep 17 00:00:00 2001
 From: Sotr <[email protected]>
 Date: Thu, 23 Aug 2018 16:14:12 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
diff --git a/Spigot-Server-Patches/0346-Anti-Xray.patch b/Spigot-Server-Patches/0342-Anti-Xray.patch
index fdaa35d93d..c8464bd216 100644
--- a/Spigot-Server-Patches/0346-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0342-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From edb9656cd2a362687134128b3b3089f491397da8 Mon Sep 17 00:00:00 2001
+From dcacc5ffb1a192fec54778a9a1bed0ed835f569c Mon Sep 17 00:00:00 2001
 From: stonar96 <[email protected]>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -1049,7 +1049,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 c6f86e8575..f5e1a26172 100644
+index 3be0a18a0a..c006cc9778 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -535,7 +535,7 @@ public class Chunk implements IChunkAccess {
@@ -1071,10 +1071,10 @@ index c6f86e8575..f5e1a26172 100644
                  this.initLighting();
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 7db075b731..c2007b4d0c 100644
+index b6ec518371..c233b7e903 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -857,7 +857,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -859,7 +859,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          }
  
          ChunkConverter chunkconverter = nbttagcompound.hasKeyOfType("UpgradeData", 10) ? new ChunkConverter(nbttagcompound.getCompound("UpgradeData")) : ChunkConverter.a;
@@ -1083,7 +1083,7 @@ index 7db075b731..c2007b4d0c 100644
  
          protochunk.a(abiomebase);
          protochunk.b(nbttagcompound.getLong("InhabitedTime"));
-@@ -963,7 +963,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -965,7 +965,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          for (int i = 0; i < nbttaglist.size(); ++i) {
              NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
              byte b0 = nbttagcompound.getByte("Y");
diff --git a/Spigot-Server-Patches/0347-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0343-Configurable-speed-for-water-flowing-over-lava.patch
index 6a26863dec..3c5bc109a1 100644
--- a/Spigot-Server-Patches/0347-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0343-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From 879a9910181dcfd5df3bcaa879b7cb9c010b3666 Mon Sep 17 00:00:00 2001
+From bd0e725d1262c94ed700e54efb8837b23f716a12 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/Spigot-Server-Patches/0348-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0344-Optimize-RegistryMaterials.patch
index 21eac8355a..3cd79c0659 100644
--- a/Spigot-Server-Patches/0348-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0344-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From a7e784f0f94bb0e29e0b4f9bd7d155c866b913c4 Mon Sep 17 00:00:00 2001
+From b75ab3f3e18bc6a798970e8dc7b1811b39da3f7c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -23,5 +23,5 @@ index 83ce386e05..a47110bba8 100644
      private int x;
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0344-isChunkGenerated-API.patch b/Spigot-Server-Patches/0344-isChunkGenerated-API.patch
deleted file mode 100644
index d04b53f32b..0000000000
--- a/Spigot-Server-Patches/0344-isChunkGenerated-API.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 497ace0dc2f99a078b58dff5a1ebdb48db924d65 Mon Sep 17 00:00:00 2001
-From: cswhite2000 <[email protected]>
-Date: Tue, 21 Aug 2018 19:44:10 -0700
-Subject: [PATCH] isChunkGenerated API
-
-Resolves #1329
-
-diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 60f249a03..fc621911e 100644
---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
-+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -34,6 +34,9 @@ public class ChunkProviderServer implements IChunkProvider {
-     private long lastQueuedSaves = 0L; // Paper
-     private long lastProcessedSaves = 0L; // Paper
-     private long lastSaveStatPrinted = System.currentTimeMillis();
-+    public boolean isChunkGenerated(int x, int z) {
-+        return this.chunks.containsKey(ChunkCoordIntPair.asLong(x, z)) || ((ChunkRegionLoader) this.chunkLoader).chunkExists(x, z);
-+    }
-     // Paper end
-     public final Long2ObjectMap<Chunk> chunks = Long2ObjectMaps.synchronize(new ChunkMap(8192));
-     private Chunk lastChunk;
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e6c2849a7..8572de4d5 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -597,6 +597,12 @@ public class CraftWorld implements World {
-         return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
-     }
- 
-+    // Paper start
-+    public boolean isChunkGenerated(int x, int z) {
-+        return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z);
-+    }
-+    // Paper end
-+
-     public ChunkGenerator getGenerator() {
-         return generator;
-     }
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0349-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0345-Add-PhantomPreSpawnEvent.patch
index 967e04703b..0efd66210f 100644
--- a/Spigot-Server-Patches/0349-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0345-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From a45277ffe97ecfe82bc0ebb7c6ff76e543e72ec2 Mon Sep 17 00:00:00 2001
+From 86aaf33f89d6a6483fbf24570cd6d2ae8bcfeec1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 2429644e9..e27600109 100644
+index 2429644e99..e276001094 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -128,6 +128,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index 2429644e9..e27600109 100644
  
          private int b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 0626b7790..413188e97 100644
+index 0626b77904..413188e970 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -50,8 +50,17 @@ public class MobSpawnerPhantom {
@@ -71,7 +71,7 @@ index 0626b7790..413188e97 100644
                                                  groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
                                                  world.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9f9ee9239..2b9731369 100644
+index 9f9ee92390..2b97313694 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
@@ -86,5 +86,5 @@ index 9f9ee9239..2b9731369 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0350-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0346-Add-More-Creeper-API.patch
index a88fe20f0c..54898cbb2d 100644
--- a/Spigot-Server-Patches/0350-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0346-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 981e33a97c8acb8e99d2fbeb790fe432b77ac87a Mon Sep 17 00:00:00 2001
+From 2119c70bba9ab8b30512b576b6f9f157adb7fe0d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
@@ -118,5 +118,5 @@ index ffebb54caa..ab2b20a0d4 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0351-Optimize-Chunk-getPos.patch b/Spigot-Server-Patches/0347-Optimize-Chunk-getPos.patch
index dd6fe92ea8..6534e04815 100644
--- a/Spigot-Server-Patches/0351-Optimize-Chunk-getPos.patch
+++ b/Spigot-Server-Patches/0347-Optimize-Chunk-getPos.patch
@@ -1,4 +1,4 @@
-From 50e2779593afd189a4d80cf496965d48b0cac746 Mon Sep 17 00:00:00 2001
+From f0b1febe6c35af1f97da719744d9949c81b1f92d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 28 Aug 2018 21:35:05 -0400
 Subject: [PATCH] Optimize Chunk#getPos
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Chunk#getPos
 Don't create an object just to get chunk coords.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f3d9211baa..ed6d0dce33 100644
+index c006cc9778..e90ce79a97 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -169,8 +169,9 @@ public class Chunk implements IChunkAccess {
@@ -20,7 +20,7 @@ index f3d9211baa..ed6d0dce33 100644
      public org.bukkit.Chunk bukkitChunk;
      public boolean mustSave;
      public boolean newChunk;
-@@ -1161,7 +1162,7 @@ public class Chunk implements IChunkAccess {
+@@ -1173,7 +1174,7 @@ public class Chunk implements IChunkAccess {
      }
  
      public ChunkCoordIntPair getPos() {
@@ -30,5 +30,5 @@ index f3d9211baa..ed6d0dce33 100644
  
      public boolean b(int i, int j) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch b/Spigot-Server-Patches/0348-Use-an-EnumMap-for-Chunk-Height-Maps.patch
index 1fb6f45523..922b0a704d 100644
--- a/Spigot-Server-Patches/0352-Use-an-EnumMap-for-Chunk-Height-Maps.patch
+++ b/Spigot-Server-Patches/0348-Use-an-EnumMap-for-Chunk-Height-Maps.patch
@@ -1,11 +1,11 @@
-From 98da4abc6afd89a1c6188ba96bb6a61f830b691b Mon Sep 17 00:00:00 2001
+From 8185aa6e6a07b058ebccba63a1ff495dd5561346 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 28 Aug 2018 22:11:13 -0400
 Subject: [PATCH] Use an EnumMap for Chunk Height Maps
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ed6d0dce33..1d301dcb70 100644
+index e90ce79a97..c168714411 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -133,7 +133,7 @@ public class Chunk implements IChunkAccess {
@@ -18,5 +18,5 @@ index ed6d0dce33..1d301dcb70 100644
          this.p = Maps.newHashMap();
          this.q = Maps.newHashMap();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/0349-Implement-Force-Loaded-Chunk-API.patch
index 2d2bff7f7c..847b60c185 100644
--- a/Spigot-Server-Patches/0353-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0349-Implement-Force-Loaded-Chunk-API.patch
@@ -1,11 +1,11 @@
-From 5de827636c18a5bfbb11aa66625ab30da6e72a43 Mon Sep 17 00:00:00 2001
+From c307438d3b9ac25b1f0ef0098db3efecf42f9058 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Wed, 29 Aug 2018 00:37:42 -0400
 Subject: [PATCH] Implement Force-Loaded Chunk API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 650e605b5..2ff8536d5 100644
+index 650e605b5b..2ff8536d59 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3023,6 +3023,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -17,7 +17,7 @@ index 650e605b5..2ff8536d5 100644
          String s = "chunks";
          ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 12c6d850d..55394e0c1 100644
+index 12c6d850d2..55394e0c15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@@ -40,20 +40,22 @@ index 12c6d850d..55394e0c1 100644
          Arrays.fill(emptySkyLight, (byte) 0xFF);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8572de4d5..580e248f8 100644
+index 8565de51f4..08fd8850c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -601,6 +601,10 @@ public class CraftWorld implements World {
-     public boolean isChunkGenerated(int x, int z) {
-         return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z);
+@@ -590,6 +590,12 @@ public class CraftWorld implements World {
+         return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
      }
-+
+ 
++    // Paper start
 +    public boolean isChunkForceLoaded(int x, int z) {
 +        return this.isChunkGenerated(x, z) && this.getHandle().isForcedChunk(x, z);
 +    }
-     // Paper end
- 
++    // Paper end
++
      public ChunkGenerator getGenerator() {
+         return generator;
+     }
 -- 
 2.19.0
 
diff --git a/Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0350-Inventory-removeItemAnySlot.patch
index e1fd2568c5..9e21f3f442 100644
--- a/Spigot-Server-Patches/0354-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0350-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From 9b8351eca28bc9eb698984166a7ea89e0eb8c322 Mon Sep 17 00:00:00 2001
+From e7c1c4daa76270e2e084477d2143aa3d76f9f108 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
@@ -57,5 +57,5 @@ index dd7b3d766f..01af982933 100644
                  // Drat! we don't have this type in the inventory
                  if (first == -1) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0351-Optimize-getChunkIfLoaded-type-calls.patch
index 1591db99fb..3891254c18 100644
--- a/Spigot-Server-Patches/0355-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0351-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From 1e8f3a642dfd5240ff160e1ed23e41db1e6f0ac7 Mon Sep 17 00:00:00 2001
+From f9d9e18d4f417f736a1db5a26add8ccd0498dfae Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
@@ -10,10 +10,10 @@ Will improve inlining across many hot methods.
 Improve getBrightness to not do double chunk map lookups.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fc621911e..99613b2ef 100644
+index c0d48c33fc..5b57ea93c8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -381,7 +381,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -378,7 +378,7 @@ public class ChunkProviderServer implements IChunkProvider {
                      continue;
                  }
  
@@ -23,7 +23,7 @@ index fc621911e..99613b2ef 100644
                      neighbor.setNeighborUnloaded(-x, -z);
                      chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2ff8536d5..0c42d042b 100644
+index 2ff8536d59..0c42d042b1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -165,7 +165,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -55,10 +55,10 @@ index 2ff8536d5..0c42d042b 100644
              return chunk != null && !chunk.isEmpty();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 580e248f8..6b46b97c8 100644
+index 08fd8850c6..2422251c72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -219,7 +219,7 @@ public class CraftWorld implements World {
+@@ -212,7 +212,7 @@ public class CraftWorld implements World {
              return false;
          }
  
@@ -67,7 +67,7 @@ index 580e248f8..6b46b97c8 100644
          if (chunk != null) {
              world.getChunkProviderServer().unload(chunk);
          }
-@@ -238,7 +238,7 @@ public class CraftWorld implements World {
+@@ -231,7 +231,7 @@ public class CraftWorld implements World {
  
      private boolean unloadChunk0(int x, int z, boolean save) {
          Boolean result = MCUtil.ensureMain("Unload Chunk", () -> { // Paper - Ensure never async
diff --git a/Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0352-Don-t-double-add-golems-to-world.patch
index c6953de840..2406360ac1 100644
--- a/Spigot-Server-Patches/0356-Don-t-double-add-golems-to-world.patch
+++ b/Spigot-Server-Patches/0352-Don-t-double-add-golems-to-world.patch
@@ -1,4 +1,4 @@
-From e882964f631dce6c71f4733d3d354d01fa94d8ca Mon Sep 17 00:00:00 2001
+From c95185732a9e8093bb039092e5f663a1d2cabdcd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 30 Aug 2018 20:56:26 -0400
 Subject: [PATCH] Don't double add golems to world
@@ -19,5 +19,5 @@ index 955041e266..5f280fcab9 100644
                      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0353-fix-newlines-in-spigot-tab-list-API.patch
index 38aa7445b5..4274f62b57 100644
--- a/Spigot-Server-Patches/0357-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0353-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From 1292c431b99d5f7240fe68b46cdc37a30a8e3e14 Mon Sep 17 00:00:00 2001
+From da4818fdaa1cfe8a528a1b2fc3bf81b3b11da253 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 1 Sep 2018 11:29:52 +0100
 Subject: [PATCH] fix newlines in spigot tab list API
@@ -55,5 +55,5 @@ index a067e39d54..5e20a9a619 100644
  
      public static IChatBaseComponent[] fromString(String message) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0354-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index a716a71459..3cf6350896 100644
--- a/Spigot-Server-Patches/0358-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0354-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 2a88ed3c018acbbe5ce52bdfa74148920cc757a4 Mon Sep 17 00:00:00 2001
+From 9b59314f27147a9fafdb72a79ed342b9d490f236 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 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 6b46b97c88..3bd32ef3e9 100644
+index 2422251c72..d0110070a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -296,7 +296,7 @@ public class CraftWorld implements World {
+@@ -289,7 +289,7 @@ public class CraftWorld implements World {
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
          chunkLoadCount++;
diff --git a/Spigot-Server-Patches/0359-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0355-Add-ray-tracing-methods-to-LivingEntity.patch
index 41a6360026..5bf992c168 100644
--- a/Spigot-Server-Patches/0359-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0355-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From cc884144a0d80b771854d1e74c12eb9e26c9e251 Mon Sep 17 00:00:00 2001
+From 1534c8e99596ef82c5ddc970766bb61ec70fad2f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c051200da..1328f8889 100644
+index c051200da8..1328f88898 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2813,6 +2813,22 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index c051200da..1328f8889 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/MovingObjectPosition.java b/src/main/java/net/minecraft/server/MovingObjectPosition.java
-index 6d5dbe89a..a31f9f607 100644
+index 6d5dbe89a6..a31f9f6072 100644
 --- a/src/main/java/net/minecraft/server/MovingObjectPosition.java
 +++ b/src/main/java/net/minecraft/server/MovingObjectPosition.java
 @@ -28,6 +28,7 @@ public class MovingObjectPosition {
@@ -44,7 +44,7 @@ index 6d5dbe89a..a31f9f607 100644
          return this.e;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0860f2334..028495700 100644
+index 0860f2334d..028495700f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -169,6 +169,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0360-Fix-concurrency-and-performance-issues-in-DataFixers.patch b/Spigot-Server-Patches/0356-Fix-concurrency-and-performance-issues-in-DataFixers.patch
index 622ff2c907..989c1f189b 100644
--- a/Spigot-Server-Patches/0360-Fix-concurrency-and-performance-issues-in-DataFixers.patch
+++ b/Spigot-Server-Patches/0356-Fix-concurrency-and-performance-issues-in-DataFixers.patch
@@ -1,4 +1,4 @@
-From a0647a441898664025560ad39980647620736867 Mon Sep 17 00:00:00 2001
+From 0e2f5e014cc3c60ca147438cfadc46d2ba35af18 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 3 Sep 2018 22:18:38 -0400
 Subject: [PATCH] Fix concurrency and performance issues in DataFixers
@@ -24,7 +24,7 @@ Additionally, many of the containsKey/get/put style operations were
 also a concurrency risk, resulting in multiple computation/insertions.
 
 diff --git a/src/main/java/com/mojang/datafixers/DataFixerUpper.java b/src/main/java/com/mojang/datafixers/DataFixerUpper.java
-index fb2c380f8..a4922a35a 100644
+index fb2c380f8a..a4922a35a2 100644
 --- a/src/main/java/com/mojang/datafixers/DataFixerUpper.java
 +++ b/src/main/java/com/mojang/datafixers/DataFixerUpper.java
 @@ -65,7 +65,7 @@ public class DataFixerUpper implements DataFixer {
@@ -58,7 +58,7 @@ index fb2c380f8..a4922a35a 100644
  
      protected IntSortedSet fixerVersions() {
 diff --git a/src/main/java/com/mojang/datafixers/NamedChoiceFinder.java b/src/main/java/com/mojang/datafixers/NamedChoiceFinder.java
-index 2c259d74e..17481fb6e 100644
+index 2c259d74e9..17481fb6e6 100644
 --- a/src/main/java/com/mojang/datafixers/NamedChoiceFinder.java
 +++ b/src/main/java/com/mojang/datafixers/NamedChoiceFinder.java
 @@ -71,8 +71,10 @@ final class NamedChoiceFinder<FT> implements OpticFinder<FT> {
@@ -75,7 +75,7 @@ index 2c259d74e..17481fb6e 100644
                          return Either.right(new Type.FieldNotFoundException(String.format("Type error for choice type \"%s\": expected type: %s, actual type: %s)", name, targetType, elementType)));
                      }
 diff --git a/src/main/java/com/mojang/datafixers/functions/PointFree.java b/src/main/java/com/mojang/datafixers/functions/PointFree.java
-index 0d88490f7..028942b8e 100644
+index 0d88490f77..028942b8ea 100644
 --- a/src/main/java/com/mojang/datafixers/functions/PointFree.java
 +++ b/src/main/java/com/mojang/datafixers/functions/PointFree.java
 @@ -14,7 +14,7 @@ public abstract class PointFree<T> {
@@ -88,7 +88,7 @@ index 0d88490f7..028942b8e 100644
              initialized = true;
              value = eval();
 diff --git a/src/main/java/com/mojang/datafixers/schemas/Schema.java b/src/main/java/com/mojang/datafixers/schemas/Schema.java
-index 7c67d989e..7faca88a8 100644
+index 7c67d989e0..7faca88a88 100644
 --- a/src/main/java/com/mojang/datafixers/schemas/Schema.java
 +++ b/src/main/java/com/mojang/datafixers/schemas/Schema.java
 @@ -20,8 +20,8 @@ import java.util.function.Function;
@@ -166,7 +166,7 @@ index 7c67d989e..7faca88a8 100644
  
      public int getVersionKey() {
 diff --git a/src/main/java/com/mojang/datafixers/types/DynamicOps.java b/src/main/java/com/mojang/datafixers/types/DynamicOps.java
-index 3c76929f2..f21531b3c 100644
+index 3c76929f24..f21531b3cd 100644
 --- a/src/main/java/com/mojang/datafixers/types/DynamicOps.java
 +++ b/src/main/java/com/mojang/datafixers/types/DynamicOps.java
 @@ -151,10 +151,10 @@ public interface DynamicOps<T> {
@@ -185,7 +185,7 @@ index 3c76929f2..f21531b3c 100644
      }
  
 diff --git a/src/main/java/com/mojang/datafixers/types/Type.java b/src/main/java/com/mojang/datafixers/types/Type.java
-index a80e3fee9..2d5bae7a3 100644
+index a80e3fee91..2d5bae7a37 100644
 --- a/src/main/java/com/mojang/datafixers/types/Type.java
 +++ b/src/main/java/com/mojang/datafixers/types/Type.java
 @@ -27,8 +27,10 @@ import javax.annotation.Nullable;
@@ -238,7 +238,7 @@ index a80e3fee9..2d5bae7a3 100644
  
      public <FT, FR> Type<?> getSetType(final OpticFinder<FT> optic, final Type<FR> newType) {
 diff --git a/src/main/java/com/mojang/datafixers/types/families/RecursiveTypeFamily.java b/src/main/java/com/mojang/datafixers/types/families/RecursiveTypeFamily.java
-index 4a1f90683..93c2f565f 100644
+index 4a1f906837..93c2f565fd 100644
 --- a/src/main/java/com/mojang/datafixers/types/families/RecursiveTypeFamily.java
 +++ b/src/main/java/com/mojang/datafixers/types/families/RecursiveTypeFamily.java
 @@ -32,7 +32,7 @@ public final class RecursiveTypeFamily implements TypeFamily {
@@ -251,7 +251,7 @@ index 4a1f90683..93c2f565f 100644
  
      public RecursiveTypeFamily(final String name, final TypeTemplate template) {
 diff --git a/src/main/java/com/mojang/datafixers/types/templates/Tag.java b/src/main/java/com/mojang/datafixers/types/templates/Tag.java
-index ece3fb5f8..396637bbd 100644
+index ece3fb5f88..396637bbd1 100644
 --- a/src/main/java/com/mojang/datafixers/types/templates/Tag.java
 +++ b/src/main/java/com/mojang/datafixers/types/templates/Tag.java
 @@ -173,8 +173,10 @@ public final class Tag implements TypeTemplate {
@@ -268,7 +268,7 @@ index ece3fb5f8..396637bbd 100644
                  if (value.isPresent()) {
                      return Pair.of(ops.createMap(map.get().entrySet().stream().filter(e -> !Objects.equals(e.getKey(), nameObject)).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))), value);
 diff --git a/src/main/java/com/mojang/datafixers/types/templates/TaggedChoice.java b/src/main/java/com/mojang/datafixers/types/templates/TaggedChoice.java
-index e6dd31233..77d64362b 100644
+index e6dd31233a..77d64362b1 100644
 --- a/src/main/java/com/mojang/datafixers/types/templates/TaggedChoice.java
 +++ b/src/main/java/com/mojang/datafixers/types/templates/TaggedChoice.java
 @@ -187,17 +187,25 @@ public final class TaggedChoice<K> implements TypeTemplate {
@@ -321,5 +321,5 @@ index e6dd31233..77d64362b 100644
          }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0361-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0357-Expose-attack-cooldown-methods-for-Player.patch
index e15916c6ab..08a705e8b5 100644
--- a/Spigot-Server-Patches/0361-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0357-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From 273f60e3c5f99173ff335828eb8aa336b7b0f8e8 Mon Sep 17 00:00:00 2001
+From 21d3bda2506312892a2973ba2fa89e07cbdd62af Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/Spigot-Server-Patches/0362-Fix-1420.patch b/Spigot-Server-Patches/0358-Fix-1420.patch
index f91cb95a64..c23c46225d 100644
--- a/Spigot-Server-Patches/0362-Fix-1420.patch
+++ b/Spigot-Server-Patches/0358-Fix-1420.patch
@@ -1,4 +1,4 @@
-From c42286bc5459f181eba0f0e65f4a35d65c556978 Mon Sep 17 00:00:00 2001
+From 6f04f7a892215d899ffab167889decb91646f910 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 7 Sep 2018 18:28:24 -0500
 Subject: [PATCH] Fix #1420
diff --git a/Spigot-Server-Patches/0363-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch b/Spigot-Server-Patches/0359-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
index 7e06569bc8..38dd232365 100644
--- a/Spigot-Server-Patches/0363-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
+++ b/Spigot-Server-Patches/0359-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
@@ -1,4 +1,4 @@
-From f6eeb525c83010ea51ebef72b2e2f99baf32620d Mon Sep 17 00:00:00 2001
+From 06760ae0e6944c59417ca06dc8d8f3a0d4966c2b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 4 Sep 2018 19:07:57 -0400
 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
@@ -46,7 +46,7 @@ index 92edfe0295..624f0e3956 100644
      public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) {
          this.a = Math.min(d0, d3);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f609e2ceda..bcd7af059e 100644
+index 4007f1ebb7..2bb6c5f3c4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1658,6 +1658,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0364-Improve-death-events.patch b/Spigot-Server-Patches/0360-Improve-death-events.patch
index 13da350f2d..e33ce1f308 100644
--- a/Spigot-Server-Patches/0364-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0360-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 7c2386886de0581784c8c667ab82ae5eba08aba7 Mon Sep 17 00:00:00 2001
+From 1a5a911f338ba258f0f7f3c2c0a62c3ad7944ad1 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,7 +27,7 @@ index 63bdb96db8..96dd1a7fa4 100644
          int i = this.f ? 300 : 100;
          if (this.g && (!this.b.isAlive() || this.b.ticksLived - this.c > i)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bcd7af059e..f6c43bab46 100644
+index 2bb6c5f3c4..c45c52084a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1538,6 +1538,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0365-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0361-Allow-chests-to-be-placed-with-NBT-data.patch
index eac1f981a2..1d01bcd9e6 100644
--- a/Spigot-Server-Patches/0365-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0361-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,4 +1,4 @@
-From 14172537b21a454dbb7cc80cc9ecb311296c4043 Mon Sep 17 00:00:00 2001
+From 3a42f991779ffb95f0b5c1b085ff93c4f42b82b2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
diff --git a/Spigot-Server-Patches/0366-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0362-Mob-Pathfinding-API.patch
index 9372d104e5..9e145b808f 100644
--- a/Spigot-Server-Patches/0366-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0362-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 6dc5e18901c4b3b5774ca4984b1209533d7bf015 Mon Sep 17 00:00:00 2001
+From 1d5af51b01ba30d990268c656d3a1491bf93a602 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
diff --git a/Spigot-Server-Patches/0367-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0363-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 2a464fc4f4..7cff7b849e 100644
--- a/Spigot-Server-Patches/0367-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0363-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,4 +1,4 @@
-From 9e1c9e2dd81743e37d5b747cbf4212f292f54f25 Mon Sep 17 00:00:00 2001
+From 60b335c4c30b65c189ec92f9d206ab27f509c819 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
diff --git a/Spigot-Server-Patches/0368-Prevent-pathfinding-from-loading-chunks.patch b/Spigot-Server-Patches/0364-Prevent-pathfinding-from-loading-chunks.patch
index c2ca245755..d6327a6575 100644
--- a/Spigot-Server-Patches/0368-Prevent-pathfinding-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0364-Prevent-pathfinding-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 853dd39389c58b51ad3b785f21297e184b914c1a Mon Sep 17 00:00:00 2001
+From 7ae53ed7437264f2eaafc89bac6335aa08426080 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 10 Sep 2018 23:52:28 -0400
 Subject: [PATCH] Prevent pathfinding from loading chunks
diff --git a/Spigot-Server-Patches/0369-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0365-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 93720e4c8b..fb588d4f47 100644
--- a/Spigot-Server-Patches/0369-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0365-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From ffd4a2a4222744b839af420ca8d24eddac98dc9b Mon Sep 17 00:00:00 2001
+From ff23354e4d2492b02ac7ebc9031d2f572225edf1 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 55afe8382..d92811925 100644
+index 55afe8382c..d928119254 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -252,6 +252,12 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
diff --git a/Spigot-Server-Patches/0370-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0366-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 844e48b3bf..0a0ad1a866 100644
--- a/Spigot-Server-Patches/0370-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0366-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From 96ec3b35d9101927da6d4bb7cdc596d43559b310 Mon Sep 17 00:00:00 2001
+From 375de81611edaa5e75db81350c4bb68a7cd7ef20 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 92101375c4..4f72b1b184 100644
+index c168714411..1a1536f6cc 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -482,6 +482,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0371-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0367-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 422b34202c..eda8a4036a 100644
--- a/Spigot-Server-Patches/0371-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0367-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 2dcf4acbf2012b8d029ad63310fe0304e8b47f1d Mon Sep 17 00:00:00 2001
+From e72b359ef8b673a1800aefb1724dce0257935750 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
diff --git a/Spigot-Server-Patches/0372-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0368-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 31e6d351c8..9b316e6fd4 100644
--- a/Spigot-Server-Patches/0372-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0368-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From b2098f05989bf94af2a4c9745bb8a968887884ed Mon Sep 17 00:00:00 2001
+From cf98648bd5d08bd79ea1a6b518a76ea503a2b11e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
diff --git a/Spigot-Server-Patches/0373-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0369-Optimize-and-Fix-ExpiringMap-Issues.patch
index f2b4cd7e83..edd02f135b 100644
--- a/Spigot-Server-Patches/0373-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0369-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From ab368bfa90e92982355649962a5335f8eafbf888 Mon Sep 17 00:00:00 2001
+From 2656fdb27028522ddd965a5e7ffbec05e0c00892 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
diff --git a/Spigot-Server-Patches/0374-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0370-Implement-furnace-cook-speed-multiplier-API.patch
index ef9120c907..38c8613021 100644
--- a/Spigot-Server-Patches/0374-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0370-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From eeb87a40d0b37892c9f4993e201a0823cb06bbcf Mon Sep 17 00:00:00 2001
+From 838c1ae863a5485fb9d229eaa79b55e699cb3d5a Mon Sep 17 00:00:00 2001
 From: Tassu <[email protected]>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
diff --git a/Spigot-Server-Patches/0375-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0371-Support-Overriding-World-Seeds.patch
index 691d348e63..9e6ec36d5e 100644
--- a/Spigot-Server-Patches/0375-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0371-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 6731262f46ea6ab3249a8cb4a2ce8338d23185e0 Mon Sep 17 00:00:00 2001
+From 2562c8931380955bc4255ff5d004824f043452f6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
diff --git a/Spigot-Server-Patches/0376-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0372-Optimize-Server-World-Map.patch
index fff2ce3486..557a2a4060 100644
--- a/Spigot-Server-Patches/0376-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0372-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 4be2d5f3cc7878ce06c25cc338534301f90b04b5 Mon Sep 17 00:00:00 2001
+From 30328eb22c58af758c294a0f708aba4fa3dd15e9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
diff --git a/Spigot-Server-Patches/0377-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0373-PreSpawnerSpawnEvent.patch
index 3fbdeedeb9..4a86f73fbe 100644
--- a/Spigot-Server-Patches/0377-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0373-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 2192d9c353bda9068f63fae9378252d923448cba Mon Sep 17 00:00:00 2001
+From ea811dc6ea87571032471d66be272a2e7dadc67b Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
diff --git a/Spigot-Server-Patches/0378-MC-134115-Fix-Double-Chest-Conversion-Error.patch b/Spigot-Server-Patches/0374-MC-134115-Fix-Double-Chest-Conversion-Error.patch
index eb83f52309..f3b6bc7847 100644
--- a/Spigot-Server-Patches/0378-MC-134115-Fix-Double-Chest-Conversion-Error.patch
+++ b/Spigot-Server-Patches/0374-MC-134115-Fix-Double-Chest-Conversion-Error.patch
@@ -1,4 +1,4 @@
-From 4ecf9eb0078780da3857ed41555a799445b85abb Mon Sep 17 00:00:00 2001
+From 27162b901293a5b7fb8c4f0ed5478d87820413e4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 20 Sep 2018 19:11:33 -0400
 Subject: [PATCH] MC-134115: Fix Double Chest Conversion Error
@@ -9,7 +9,7 @@ loss from chunks if they crossed chunk boundries.
 This fixes the issue.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4f72b1b184..1c4e892aad 100644
+index 1a1536f6cc..a0d08a89a3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -515,6 +515,26 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0380-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0375-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 41a5f82f30..8cd16061e7 100644
--- a/Spigot-Server-Patches/0380-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0375-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From fb750f7e99c0c9d56b594609f9f61e6fb6d38216 Mon Sep 17 00:00:00 2001
+From cf485d4bf8b9b36444afdecb12a41edb3901f400 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -26,7 +26,7 @@ index 729859d132..2a1dffbf48 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f6c43bab46..8c2ce70060 100644
+index c45c52084a..0237049a40 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1733,7 +1733,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0381-Enable-experimental-ASM-support-for-Java-11-plugins.patch b/Spigot-Server-Patches/0376-Enable-experimental-ASM-support-for-Java-11-plugins.patch
index 4a38446a8d..6af6f6b5f6 100644
--- a/Spigot-Server-Patches/0381-Enable-experimental-ASM-support-for-Java-11-plugins.patch
+++ b/Spigot-Server-Patches/0376-Enable-experimental-ASM-support-for-Java-11-plugins.patch
@@ -1,4 +1,4 @@
-From e60758f4757a625ff2226db56c8c46b185fbbd77 Mon Sep 17 00:00:00 2001
+From ebeed82ef328c09d7247d0c4b8e6d436c95498dc Mon Sep 17 00:00:00 2001
 From: Kyle Wood <[email protected]>
 Date: Sun, 23 Sep 2018 12:52:21 -0500
 Subject: [PATCH] Enable experimental ASM support for Java 11 plugins
@@ -15,19 +15,6 @@ experimental API when required, so we check the class version first.
 
 This should be removed as soon as ASM API 7 is stable.
 
-diff --git a/pom.xml b/pom.xml
-index 1e7d2b5506..6d8b27e927 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -83,7 +83,7 @@
-         <dependency>
-             <groupId>org.ow2.asm</groupId>
-             <artifactId>asm</artifactId>
--            <version>6.2</version>
-+            <version>6.2.1</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 index d172a1aebc..7f2a73d6f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
diff --git a/Spigot-Server-Patches/0382-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0377-Avoid-dimension-id-collisions.patch
index 9fa62a85ef..b198afe46a 100644
--- a/Spigot-Server-Patches/0382-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0377-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 39959f57410189de5a88d5ac20f101632c3a8c98 Mon Sep 17 00:00:00 2001
+From 2b2384045aafaf4dfeafc598a5bb92c830918a54 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 23663ede9..cb2255a5d 100644
+index 23663ede9f..cb2255a5d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -968,7 +968,7 @@ public final class CraftServer implements Server {
@@ -21,5 +21,5 @@ index 23663ede9..cb2255a5d 100644
                      dimension++;
                      break;
 -- 
-2.16.1.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0383-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0378-Honor-EntityAgeable.ageLock.patch
index 37076ef88c..7ba81bcf9b 100644
--- a/Spigot-Server-Patches/0383-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0378-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From f77b542b755eef4f372e17a29f5604f43c6b8ea2 Mon Sep 17 00:00:00 2001
+From 5cae988d74542611a68c0b657ec3fb5c277dc6f2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 1d7c998aa..a11bdaadc 100644
+index 1d7c998aa6..a11bdaadca 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0384-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0379-Async-Chunk-Loading-and-Generation.patch
index 2d0c089328..18175ee4cf 100644
--- a/Spigot-Server-Patches/0384-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0379-Async-Chunk-Loading-and-Generation.patch
@@ -1,6 +1,6 @@
-From 815ddeb3be11a9c190bf98c31bbed0ae8b861f6d Mon Sep 17 00:00:00 2001
+From 0748d98c1a276904da0c772e8117026d7e3662ef Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
-Date: Sat, 1 Sep 2018 12:20:09 -0400
+Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
 
 This brings back parity to 1.12 and older versions in that any
@@ -346,10 +346,10 @@ index 0000000000..8dfed1a8cf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 165a901010..51d1503fb3 100644
+index a0d08a89a3..e885dd5755 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -917,6 +917,7 @@ public class Chunk implements IChunkAccess {
+@@ -929,6 +929,7 @@ public class Chunk implements IChunkAccess {
      }
  
      public void addEntities() {
@@ -385,10 +385,10 @@ index b941676829..1b85520775 100644
  
      public Chunk a(Long olong, Chunk chunk) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 99613b2ef3..56576d2d06 100644
+index 5b57ea93c8..4f36ddc042 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -41,9 +41,9 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -38,9 +38,9 @@ public class ChunkProviderServer implements IChunkProvider {
      public final Long2ObjectMap<Chunk> chunks = Long2ObjectMaps.synchronize(new ChunkMap(8192));
      private Chunk lastChunk;
      private final ChunkTaskScheduler chunkScheduler;
@@ -400,7 +400,7 @@ index 99613b2ef3..56576d2d06 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator<?> chunkgenerator, IAsyncTaskHandler iasynctaskhandler) {
          this.world = worldserver;
-@@ -80,10 +80,61 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -77,10 +77,61 @@ public class ChunkProviderServer implements IChunkProvider {
          this.unloadQueue.remove(ChunkCoordIntPair.a(i, j));
      }
  
@@ -462,7 +462,7 @@ index 99613b2ef3..56576d2d06 100644
  
          synchronized (this.chunkLoader) {
              // Paper start - remove vanilla lastChunk, we do it more accurately
-@@ -91,13 +142,15 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -88,13 +139,15 @@ public class ChunkProviderServer implements IChunkProvider {
                  return this.lastChunk;
              }*/ // Paper end
  
@@ -481,7 +481,7 @@ index 99613b2ef3..56576d2d06 100644
  
              if (flag) {
                  try (co.aikar.timings.Timing timing = world.timings.syncChunkLoadTimer.startTiming()) { // Paper
-@@ -153,7 +206,8 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -150,7 +203,8 @@ public class ChunkProviderServer implements IChunkProvider {
          return (IChunkAccess) (chunk != null ? chunk : (IChunkAccess) this.chunkScheduler.b(new ChunkCoordIntPair(i, j), flag));
      }
  
@@ -491,7 +491,7 @@ index 99613b2ef3..56576d2d06 100644
          this.batchScheduler.b();
          Iterator iterator = iterable.iterator();
  
-@@ -171,6 +225,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -168,6 +222,7 @@ public class ChunkProviderServer implements IChunkProvider {
          return this.batchScheduler.c();
      }
  
@@ -499,7 +499,7 @@ index 99613b2ef3..56576d2d06 100644
      private ReportedException a(int i, int j, Throwable throwable) {
          CrashReport crashreport = CrashReport.a(throwable, "Exception generating new chunk");
          CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Chunk to be generated");
-@@ -290,11 +345,13 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -287,11 +342,13 @@ public class ChunkProviderServer implements IChunkProvider {
      }
  
      public void close() {
@@ -515,17 +515,17 @@ index 99613b2ef3..56576d2d06 100644
  
      }
  
-@@ -433,4 +490,5 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -430,4 +487,5 @@ public class ChunkProviderServer implements IChunkProvider {
      public boolean isLoaded(int i, int j) {
          return this.chunks.containsKey(ChunkCoordIntPair.a(i, j));
      }
 +
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index c2007b4d0c..9b8db0c612 100644
+index c233b7e903..edd0742527 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -128,7 +128,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -120,7 +120,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      // CraftBukkit start
      private boolean check(ChunkProviderServer cps, int x, int z) throws IOException {
          if (cps != null) {
@@ -534,7 +534,7 @@ index c2007b4d0c..9b8db0c612 100644
              if (cps.isLoaded(x, z)) {
                  return true;
              }
-@@ -378,11 +378,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -380,11 +380,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                      }
                  };
              } else {
@@ -644,7 +644,7 @@ index 271dc41d45..bd15534c23 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8c2ce70060..244302d45b 100644
+index 0237049a40..cd601f29a3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -209,7 +209,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1807,21 +1807,27 @@ index cb2255a5d0..19f2f2bbd8 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3bd32ef3e9..70b6a59d97 100644
+index d0110070a9..02b6bf2990 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -162,9 +162,7 @@ public class CraftWorld implements World {
-     public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(final int x, final int z, final boolean gen) {
-         final ChunkProviderServer cps = this.world.getChunkProviderServer();
-         java.util.concurrent.CompletableFuture<Chunk> future = new java.util.concurrent.CompletableFuture<>();
--        net.minecraft.server.Chunk chunk = cps.getChunkAt(x, z, true, gen);
--        // TODO: Add back async variant
--        future.complete(chunk != null ? chunk.bukkitChunk : null);
+@@ -157,6 +157,16 @@ public class CraftWorld implements World {
+         }
+     }
+ 
++    // Paper start - Async chunk load API
++    @Override
++    public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(final int x, final int z, final boolean gen) {
++        final ChunkProviderServer cps = this.world.getChunkProviderServer();
++        java.util.concurrent.CompletableFuture<Chunk> future = new java.util.concurrent.CompletableFuture<>();
 +        cps.getChunkAt(x, z, true, gen, chunk -> future.complete(chunk != null ? chunk.bukkitChunk : null));
-         return future;
++        return future;
++    }
++    // Paper end
++
+     public Chunk getChunkAt(int x, int z) {
+         return this.world.getChunkProviderServer().getChunkAt(x, z, true, true).bukkitChunk;
      }
-     // Paper end
-@@ -1344,10 +1342,13 @@ public class CraftWorld implements World {
+@@ -1333,10 +1343,13 @@ public class CraftWorld implements World {
          int chunkCoordZ = chunkcoordinates.getZ() >> 4;
          // Cycle through the 25x25 Chunks around it to load/unload the chunks.
          int radius = world.paperConfig.keepLoadedRange / 16; // Paper
diff --git a/Spigot-Server-Patches/0379-Sync-Player-Position-to-Vehicles.patch b/Spigot-Server-Patches/0379-Sync-Player-Position-to-Vehicles.patch
deleted file mode 100644
index cdfdb5d407..0000000000
--- a/Spigot-Server-Patches/0379-Sync-Player-Position-to-Vehicles.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 192a5b761d782ec3576db72ceb19416670fa8b57 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Fri, 21 Sep 2018 11:34:00 -0400
-Subject: [PATCH] Sync Player Position to Vehicles
-
-Player Positions could become desynced with their vehicle resulting
-in chunk conflicts about which chunk the entity should really be in.
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 452c279708..e7a2df685d 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -375,10 +375,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                 }
- 
-                 entity.setLocation(d3, d4, d5, f, f1);
-+                Location curPos = getPlayer().getLocation(); // Paper
-+                player.setLocation(d3, d4, d5, f, f1); // Paper
-                 boolean flag2 = worldserver.getCubes(entity, entity.getBoundingBox().shrink(0.0625D));
- 
-                 if (flag && (flag1 || !flag2)) {
-                     entity.setLocation(d0, d1, d2, f, f1);
-+                    player.setLocation(d0, d1, d2, f, f1); // Paper
-                     this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
-                     return;
-                 }
-@@ -388,7 +391,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                 // Spigot Start
-                 if ( !hasMoved )
-                 {
--                    Location curPos = player.getLocation();
-+                    //Location curPos = player.getLocation(); // Paper - move up
-                     lastPosX = curPos.getX();
-                     lastPosY = curPos.getY();
-                     lastPosZ = curPos.getZ();
--- 
-2.19.0
-
diff --git a/work/Bukkit b/work/Bukkit
-Subproject b9620fd935d0e576a919297e394580a5c3fe4ae
+Subproject 0812ce2ccec4dce83fe382965242e35ec4022fa
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 020b495274c324208721de841671298060d9398
+Subproject 4824655c8972cc9b6dbfb152767e33aa90628d3
diff --git a/work/Spigot b/work/Spigot
-Subproject f823ac54b178bd043f126507996ba57ca38f0ec
+Subproject f6a273b19fc2eeb2a91cd90d59f1faaad813437
author	Aikar <[email protected]>	2018-09-26 22:35:42 -0400
committer	Aikar <[email protected]>	2018-09-26 22:35:46 -0400
commit	2365b308c8a80e3aebf99680bd90e5025e7dec53 (patch)
tree	554850ecac513073aa03211079c397aab215bd16
parent	c5fbde9f17a6cc61d350d6263051cc32c430c9a7 (diff)
download	Paper-2365b308c8a80e3aebf99680bd90e5025e7dec53.tar.gz Paper-2365b308c8a80e3aebf99680bd90e5025e7dec53.zip