Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated
00763e1b Deprecate some methods
35a83d54 SPIGOT-4572: Make default no permission message clearer
6163343d Fix some misplaced material enum entries
8736469c Fix typo in TechnicalPiston documentation

CraftBukkit Changes:
0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative
50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost
8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml
07e504c3 Clarify exception thrown when setting drop chance for player inventory
98b862ad Fix duplicate iron golem add
843cee65 Fix a bunch of duplicate EntityCombustEvent calls
43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms

Spigot-API-Patches/0003-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 15f8a51dda512997d8ae210163f07dc807455333 Mon Sep 17 00:00:00 2001
+From ff98fafe0ee4c98543641b45bb0e6c0a261c69d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -2982,10 +2982,10 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2ce17440..7fdd1a08 100644
+index b90cbaed..52ce3cd4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -568,7 +568,6 @@ public final class Bukkit {
+@@ -572,7 +572,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2994,10 +2994,10 @@ index 2ce17440..7fdd1a08 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 63392d5e..0e7a81c8 100644
+index 58a1ee61..6572f3ac 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1150,12 +1150,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -1154,12 +1154,27 @@ public interface Server extends PluginMessageRecipient {
      // Spigot start
      public class Spigot
      {
@@ -3051,7 +3051,7 @@ index 00000000..fd452bce
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4c931f18..4a479627 100644
+index 33e8681d..db7f4428 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,8 @@ public abstract class Command {

Spigot-API-Patches/0005-Add-getTPS-method.patch

@@ -1,14 +1,14 @@
-From 54b68ef1792c46a500d9e0ece68e0c42ef4d1b90 Mon Sep 17 00:00:00 2001
+From 2d46f80ca7111d829da20a036e72c27aaa6cd253 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7fdd1a08..a20c7b73 100644
+index 52ce3cd4..8a6529f3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1270,6 +1270,16 @@ public final class Bukkit {
+@@ -1274,6 +1274,16 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -26,10 +26,10 @@ index 7fdd1a08..a20c7b73 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0e7a81c8..6e8b1380 100644
+index 6572f3ac..9651a45c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1052,6 +1052,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -1056,6 +1056,15 @@ public interface Server extends PluginMessageRecipient {
       */
      Entity getEntity(UUID uuid);
  
@@ -46,5 +46,5 @@ index 0e7a81c8..6e8b1380 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0013-Expose-server-CommandMap.patch

@@ -1,14 +1,14 @@
-From 76b7c9bfc8893c63975484bf9223df8c1e50c6e7 Mon Sep 17 00:00:00 2001
+From 96b07d31cd5a0d02af4482fc3e8141ec8b360c8e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a20c7b73..32db4b77 100644
+index 8a6529f3..d4b7c539 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1390,6 +1390,17 @@ public final class Bukkit {
+@@ -1394,6 +1394,17 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -27,10 +27,10 @@ index a20c7b73..32db4b77 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6e8b1380..10ee377a 100644
+index 9651a45c..b9a75b2d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1061,6 +1061,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1065,6 +1065,14 @@ public interface Server extends PluginMessageRecipient {
      public double[] getTPS();
      // Paper end
  
@@ -46,5 +46,5 @@ index 6e8b1380..10ee377a 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From 36623d7f4638ade865cac295f0e70254df2ba482 Mon Sep 17 00:00:00 2001
+From 70541080fa91240503bba54632ebddfba554c439 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 32db4b77d..0119a2cda 100644
+index d4b7c539..f14339af 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -285,6 +285,26 @@ public final class Bukkit {
+@@ -289,6 +289,26 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -37,10 +37,10 @@ index 32db4b77d..0119a2cda 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 10ee377a9..6ad830d72 100644
+index b9a75b2d..ce369aa3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -233,6 +233,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -237,6 +237,26 @@ public interface Server extends PluginMessageRecipient {
       */
      public int broadcastMessage(String message);
  
@@ -68,7 +68,7 @@ index 10ee377a9..6ad830d72 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4208b0d2c..fc2d4da89 100644
+index d72a7e3d..bf86eb67 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -414,6 +414,36 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -109,5 +109,5 @@ index 4208b0d2c..fc2d4da89 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -1,4 +1,4 @@
-From 2ff0f3ba22c66ac327e2a70fbbd807f6d52e9747 Mon Sep 17 00:00:00 2001
+From 91a807a7fbb2e9081a9c0311ca3cd801bd6a3bb0 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0119a2cd..39ff2f9e 100644
+index f14339af..60e7ceb6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1419,6 +1419,13 @@ public final class Bukkit {
+@@ -1423,6 +1423,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 0119a2cd..39ff2f9e 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6ad830d7..80ef1270 100644
+index ce369aa3..2c07e6a2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1236,4 +1236,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1240,4 +1240,6 @@ public interface Server extends PluginMessageRecipient {
  
      Spigot spigot();
      // Spigot end
@@ -105,5 +105,5 @@ index b88f31ca..bd0588a2 100644
 +
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From f643969a027f9886c578f9702b3d919bf573e93c Mon Sep 17 00:00:00 2001
+From 9fa647183cd2baf1c91e1138b8da71cab372831a Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 39ff2f9e..b4a7835a 100644
+index 60e7ceb6..66ebbaf7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1426,6 +1426,15 @@ public final class Bukkit {
+@@ -1430,6 +1430,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index 39ff2f9e..b4a7835a 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80ef1270..1a0a30ee 100644
+index 2c07e6a2..2fbee277 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1238,4 +1238,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1242,4 +1242,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper
@@ -97,5 +97,5 @@ index f331a442..a977045d 100644
                  confirmed = true;
              } else {
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From 606a3a3606a8406779eb08b91508a22920ed284b Mon Sep 17 00:00:00 2001
+From 5c7930d6c02a578a42cac2d5940d4b3802923674 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b4a7835a..cb21a4e4 100644
+index 66ebbaf7..06d1725d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1435,6 +1435,16 @@ public final class Bukkit {
+@@ -1439,6 +1439,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index b4a7835a..cb21a4e4 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1a0a30ee..10f56d4f 100644
+index 2fbee277..edadec3f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1240,4 +1240,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1244,4 +1244,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper

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

@@ -1,4 +1,4 @@
-From e794550eeff1ff454e3507e15e356a6970004b5a Mon Sep 17 00:00:00 2001
+From fd193171492260fcd83f90775fd3e47f68d01f5a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -21,10 +21,10 @@ index 43239f84..fe8d3468 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 013df5f8..14d1983a 100644
+index 8a0f992f..d499e41b 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1604,6 +1604,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1606,6 +1606,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 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1619,6 +1620,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1621,6 +1622,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 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1668,6 +1670,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1670,6 +1672,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 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1687,6 +1690,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1689,6 +1692,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 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1742,6 +1746,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1744,6 +1748,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 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1763,6 +1768,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1765,6 +1770,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()}
@@ -72,7 +72,7 @@ index 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1785,6 +1791,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1787,6 +1793,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -80,7 +80,7 @@ index 013df5f8..14d1983a 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
  
-@@ -1809,6 +1816,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1811,6 +1818,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings

Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 5f476c71f78bbd03f6d90d9bde7ae9254569f79d Mon Sep 17 00:00:00 2001
+From b6914c6a90828e0fba1c673bc2dd43a32b7c28ca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -232,7 +232,7 @@ index 00000000..d17061e6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cb21a4e4..02e7d118 100644
+index 06d1725d..bc04472e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -51,6 +51,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -245,7 +245,7 @@ index cb21a4e4..02e7d118 100644
  /**
   * Represents the Bukkit core, for version and Server singleton handling
   */
-@@ -1445,6 +1448,37 @@ public final class Bukkit {
+@@ -1449,6 +1452,37 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -284,7 +284,7 @@ index cb21a4e4..02e7d118 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 10f56d4f..9e7bc162 100644
+index edadec3f..9f3ffb16 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -52,6 +52,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -297,7 +297,7 @@ index 10f56d4f..9e7bc162 100644
  /**
   * Represents a server implementation.
   */
-@@ -1249,5 +1252,30 @@ public interface Server extends PluginMessageRecipient {
+@@ -1253,5 +1256,30 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
@@ -329,5 +329,5 @@ index 10f56d4f..9e7bc162 100644
      // Paper end
  }
 -- 
-2.19.1
+2.20.1
 

Spigot-API-Patches/0088-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From e1d2e8f216b7fda9a9c87aa3540e2b73307a19d7 Mon Sep 17 00:00:00 2001
+From a6af67f99eedf4c5f95deb04a8f4bac3be154a7f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 02e7d118..233a7154 100644
+index bc04472e..bd246827 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -431,6 +431,20 @@ public final class Bukkit {
+@@ -435,6 +435,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 02e7d118..233a7154 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9e7bc162..b8076fc3 100644
+index 9f3ffb16..5eb1d371 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -361,6 +361,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -365,6 +365,18 @@ public interface Server extends PluginMessageRecipient {
       */
      public Player getPlayer(UUID id);
  

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

@@ -1,4 +1,4 @@
-From e32d00e63c653173ca88ee153f4b38d474ebc117 Mon Sep 17 00:00:00 2001
+From 1d5e8a86bb4cb2d3b56a98d9b8ebb662146398dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 14d1983a..1dccdad5 100644
+index d499e41b..bc6a51d7 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2,6 +2,8 @@ package org.bukkit;
@@ -18,7 +18,7 @@ index 14d1983a..1dccdad5 100644
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
-@@ -481,6 +483,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -483,6 +485,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
  

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

@@ -1,4 +1,4 @@
-From 087ea8fe096e32f8404d94d41d759a593365bd5e Mon Sep 17 00:00:00 2001
+From fd0c3591ced0cfa123d9226f18318fb0e0c87536 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -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 1dccdad5..926cb61f 100644
+index bc6a51d7..6b7eeeac 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2004,7 +2004,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2006,7 +2006,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */

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

@@ -1,4 +1,4 @@
-From a53c306b2523a763f792cfd88668cb6047265cd9 Mon Sep 17 00:00:00 2001
+From 6553511fc842e8a3ff931f0e1988a86a5366c2f2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -98,10 +98,10 @@ index 162a76e8..056a4d6b 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 926cb61f..b008c280 100644
+index 6b7eeeac..c73b7065 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1149,6 +1149,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1151,6 +1151,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(Location loc, float power, boolean setFire);
  

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

@@ -1,14 +1,14 @@
-From 148138b4f5639ec234c022057eeb0f6c50e21a1c Mon Sep 17 00:00:00 2001
+From 6b5f92bce47286c4b5f7c42852b75d76386b8ee6 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b008c280..b836459b 100644
+index c73b7065..e424ed4e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -739,6 +739,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -741,6 +741,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
  

Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch

@@ -1,14 +1,14 @@
-From 28b07fbe11475f6ab3ce856ba3aa93cb64bfc4c5 Mon Sep 17 00:00:00 2001
+From 0d5f37d29aa15797bee4ce70de33397738a66fd7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 2dbba001..ec58e972 100644
+index 3585f109..6992b702 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
-@@ -117,6 +117,33 @@ public interface Inventory extends Iterable<ItemStack> {
+@@ -121,6 +121,33 @@ public interface Inventory extends Iterable<ItemStack> {
       */
      public HashMap<Integer, ItemStack> removeItem(ItemStack... items) throws IllegalArgumentException;
  

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

@@ -1,14 +1,14 @@
-From cacc745bfa3a5223ae5468436ed59a6d007ea9dd Mon Sep 17 00:00:00 2001
+From 59d5938f6df932f95a46b64f5f436921ac4334ea Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 482c6080..02d4afd7 100644
+index 60b7f2e3..5df75830 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1447,6 +1447,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1449,6 +1449,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public void setFullTime(long time);
  

Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch

@@ -1,14 +1,14 @@
-From 7a729003770c77b436b94759d729f350a35ab14e Mon Sep 17 00:00:00 2001
+From 517f55139989739289d2423bf74eee73f855e8a3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:44:54 +0000
 Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 233a7154..22ca2900 100644
+index bd246827..f456f5a0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1463,6 +1463,14 @@ public final class Bukkit {
+@@ -1467,6 +1467,14 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -24,10 +24,10 @@ index 233a7154..22ca2900 100644
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b8076fc3..9c78f18f 100644
+index 5eb1d371..238f583d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1265,6 +1265,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1269,6 +1269,12 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
@@ -41,14 +41,14 @@ index b8076fc3..9c78f18f 100644
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4a479627..77171cd1 100644
+index db7f4428..77171cd1 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -180,7 +180,7 @@ public abstract class Command {
          }
  
          if (permissionMessage == null) {
--            target.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.");
+-            target.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is a mistake.");
 +            target.sendMessage(Bukkit.getPermissionMessage()); // Paper
          } else if (permissionMessage.length() != 0) {
              for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {

Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch

@@ -1,4 +1,4 @@
-From 418c4f16ed43996663c1d7843189b5c783988622 Mon Sep 17 00:00:00 2001
+From 68a23948d30b920b302c42cd4fc9eb1ab9b47c5c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 961966e16..56700fc59 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 961966e16..56700fc59 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 b1a4a6d70..e72ccefc2 100644
+index 33229f45d9..c87d11da5b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -44,7 +44,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
@@ -40,7 +40,7 @@ index b1a4a6d70..e72ccefc2 100644
      private int id;
      public boolean j;
      public final List<Entity> passengers;
-@@ -1759,12 +1759,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1775,12 +1775,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -75,7 +75,7 @@ index b1a4a6d70..e72ccefc2 100644
  
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index a07ee150c..d74bfa120 100644
+index a07ee150c2..d74bfa1201 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -240,6 +240,7 @@ public class EntityTypes<T extends Entity> {
@@ -88,7 +88,7 @@ index a07ee150c..d74bfa120 100644
      }
 diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
 new file mode 100644
-index 000000000..743142d03
+index 0000000000..743142d030
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +1,9 @@
@@ -102,7 +102,7 @@ index 000000000..743142d03
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 62b6e6eb3..7390061bf 100644
+index 62b6e6eb38..7390061bf0 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -7,11 +7,11 @@ import org.apache.logging.log4j.Logger;

Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch

@@ -1,4 +1,4 @@
-From 8530b48c5697baa5a57bb85b04151485deb0257c Mon Sep 17 00:00:00 2001
+From 2fae759524a8a56cb30d347edcaa0e1c77d52aac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 417c015e5..b728a44f5 100644
+index 417c015e56..b728a44f5f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -36,7 +36,7 @@ public class Chunk implements IChunkAccess {
@@ -94,7 +94,7 @@ index 417c015e5..b728a44f5 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 e72ccefc2..48ec5e047 100644
+index c87d11da5b..faf4d0c0db 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -132,7 +132,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -106,7 +106,7 @@ index e72ccefc2..48ec5e047 100644
      public int chunkX; public int getChunkX() { return chunkX; } // Paper - OBFHELPER
      public int chunkY; public int getChunkY() { return chunkY; } // Paper - OBFHELPER
      public int chunkZ; public int getChunkZ() { return chunkZ; } // Paper - OBFHELPER
-@@ -1760,6 +1760,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1776,6 +1776,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -147,7 +147,7 @@ index e72ccefc2..48ec5e047 100644
      private String entityKeyString;
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 7390061bf..c69209497 100644
+index 7390061bf0..c69209497b 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -167,7 +167,7 @@ index 7390061bf..c69209497 100644
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2c57a4f03..153efb9b9 100644
+index a3435c11ed..8fb0ecf525 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -9,6 +9,7 @@ import java.util.UUID;

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

@@ -1,4 +1,4 @@
-From 01da9c4f93a7c0d86e678edce549d640c557582e Mon Sep 17 00:00:00 2001
+From 91dad8baaa433762ab478445014308c044e967b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -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..66d02e048
+index 0000000000..66d02e048b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 000000000..66d02e048
 +}
 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 255b8bed0..fe148495b 100644
+index c4c1877d59..1256a0d589 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 255b8bed0..fe148495b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index c09961be9..dbf1089ba 100644
+index c09961be9b..dbf1089bac 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -22,6 +22,15 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index c09961be9..dbf1089ba 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 23dee9b56..eca1284cc 100644
+index 23dee9b563..eca1284cc3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -854,6 +854,7 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index 23dee9b56..eca1284cc 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index df2711a5f..732c8793e 100644
+index df2711a5f8..732c8793e5 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> {
@@ -357,7 +357,7 @@ index df2711a5f..732c8793e 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a8cdcb7da..eb83e20d5 100644
+index a8cdcb7da8..eb83e20d50 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -88,7 +88,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index a8cdcb7da..eb83e20d5 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 8e5ce6c18..35976a26f 100644
+index 8e5ce6c181..35976a26f3 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -445,7 +445,7 @@ index 8e5ce6c18..35976a26f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index 65574eb2e..bc87cfc4b 100644
+index 65574eb2e5..bc87cfc4b6 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -12,12 +12,22 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index 65574eb2e..bc87cfc4b 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 f28f4f3cd..6b417be1d 100644
+index f28f4f3cd3..6b417be1dd 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -100,7 +100,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index f28f4f3cd..6b417be1d 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 ad9c00bc8..4e9ef43b4 100644
+index ad9c00bc80..4e9ef43b45 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;
@@ -538,7 +538,7 @@ index ad9c00bc8..4e9ef43b4 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 8412af434..dc0e4a999 100644
+index faf4d0c0db..e329c2f48a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@@ -560,7 +560,7 @@ index 8412af434..dc0e4a999 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -535,7 +536,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -551,7 +552,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
@@ -568,7 +568,7 @@ index 8412af434..dc0e4a999 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().d(d0, d1, d2));
              this.recalcPosition();
-@@ -885,7 +885,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -901,7 +901,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.methodProfiler.exit();
          }
@@ -577,7 +577,7 @@ index 8412af434..dc0e4a999 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 ed859ccf9..31bbbbd96 100644
+index ed859ccf95..31bbbbd969 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;
@@ -653,7 +653,7 @@ index ed859ccf9..31bbbbd96 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index cd462f7df..45ab33d1a 100644
+index cd462f7dfc..45ab33d1ae 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 {
@@ -684,7 +684,7 @@ index cd462f7df..45ab33d1a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 72de40434..7e89d7158 100644
+index 72de40434f..7e89d7158b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -837,7 +837,7 @@ index 72de40434..7e89d7158 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c24f4a8fe..e01222ad2 100644
+index c24f4a8fea..e01222ad2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -929,7 +929,7 @@ index c24f4a8fe..e01222ad2 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 08d1b859d..13453bd5e 100644
+index 08d1b859d9..13453bd5e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -984,7 +984,7 @@ index 08d1b859d..13453bd5e 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 6c88d0c86..8bf94c1b9 100644
+index 6c88d0c86a..8bf94c1b96 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,11 +1,17 @@
@@ -1006,7 +1006,7 @@ index 6c88d0c86..8bf94c1b9 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 54e44cba3..3a83819d5 100644
+index 54e44cba35..3a83819d56 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1030,7 +1030,7 @@ index 54e44cba3..3a83819d5 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 0da57948a..6571fc595 100644
+index 0da57948a3..6571fc5952 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> {
@@ -1084,7 +1084,7 @@ index 0da57948a..6571fc595 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;
@@ -1104,7 +1104,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 5531f5205..209091a9c 100644
+index 5531f5205e..209091a9cb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1212,7 +1212,7 @@ index 5531f5205..209091a9c 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 a7ae16681..5a7087c75 100644
+index a7ae16681d..5a7087c758 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1314,7 +1314,7 @@ index a7ae16681..5a7087c75 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f31b18dd2..1a2473541 100644
+index f31b18dd2c..1a2473541d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1945,12 +1945,31 @@ public final class CraftServer implements Server {
@@ -1351,7 +1351,7 @@ index f31b18dd2..1a2473541 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 2ab4b11a8..000000000
+index 2ab4b11a8d..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1529,7 +1529,7 @@ index 2ab4b11a8..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 @@
@@ -1565,7 +1565,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 753704c87..ca3393ef8 100644
+index 753704c87d..ca3393ef8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1584,7 +1584,7 @@ index 753704c87..ca3393ef8 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 646128f16..d75cc42e1 100644
+index 646128f16d..d75cc42e11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicReference;
@@ -1651,7 +1651,7 @@ index 646128f16..d75cc42e1 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 3f55381c1..f32e66010 100644
+index 3f55381c15..f32e660107 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.scheduler;
@@ -1733,7 +1733,7 @@ index 3f55381c1..f32e66010 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;
@@ -1745,7 +1745,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 c1071c92e..a99c0cea0 100644
+index c1071c92ee..a99c0cea0f 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;

Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch

@@ -1,11 +1,11 @@
-From c2a3971992e2776208a372c02253f0821908b163 Mon Sep 17 00:00:00 2001
+From 478b9e5309586023d078cba0bc4b0d22a129f686 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 098bd3fb..55d8e74f 100644
+index 098bd3fba8..55d8e74f82 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,4 +73,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index 098bd3fb..55d8e74f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 24ee8d81..03886a4f 100644
+index e3d52e7cf7..002be7f7be 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -19,7 +19,7 @@ public class EntityZombie extends EntityMonster {
+@@ -18,7 +18,7 @@ public class EntityZombie extends EntityMonster {
  
      protected static final IAttribute c = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
      private static final UUID a = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
@@ -32,7 +32,7 @@ index 24ee8d81..03886a4f 100644
      private static final DataWatcherObject<Boolean> bC = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Integer> bD = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
      private static final DataWatcherObject<Boolean> bE = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
-@@ -130,9 +130,9 @@ public class EntityZombie extends EntityMonster {
+@@ -129,9 +129,9 @@ public class EntityZombie extends EntityMonster {
          if (this.world != null && !this.world.isClientSide) {
              AttributeInstance attributeinstance = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
  
@@ -45,5 +45,5 @@ index 24ee8d81..03886a4f 100644
          }
  
 -- 
-2.17.1
+2.20.1
 

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

@@ -1,11 +1,11 @@
-From c2c5e7da6e22bdab35fda8998f1426f1df3dbb0c Mon Sep 17 00:00:00 2001
+From 320dd5815173fe4d72fc4cdf0477f3fb46b9e86c Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3f734327c..1ed58f4bb 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 3f734327c..1ed58f4bb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f36ab639f..4baf5750e 100644
+index e329c2f48a..2b4a784e4d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1863,6 +1863,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1879,6 +1879,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
@@ -36,7 +36,7 @@ index f36ab639f..4baf5750e 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 4e4c8cc50..a6eae266d 100644
+index 4e4c8cc501..a6eae266de 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -86,6 +86,17 @@ public class EntityFallingBlock extends Entity {
@@ -58,7 +58,7 @@ index 4e4c8cc50..a6eae266d 100644
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 3977498c4..5dc52b6b8 100644
+index 3977498c4b..5dc52b6b89 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity {

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

@@ -1,11 +1,11 @@
-From af9f39d585bc18e5f8208883bc376f74609ca528 Mon Sep 17 00:00:00 2001
+From 1342f7d2b36a0aa22b7ae6eee34015b790d16f5e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dbbe43220..75d63b4e6 100644
+index 2b4a784e4d..22f757756c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -160,6 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index dbbe43220..75d63b4e6 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1604,6 +1605,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1620,6 +1621,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  }
              }
  
@@ -28,7 +28,7 @@ index dbbe43220..75d63b4e6 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1745,6 +1751,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1761,6 +1767,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index dbbe43220..75d63b4e6 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1820,6 +1833,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1836,6 +1849,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -51,7 +51,7 @@ index dbbe43220..75d63b4e6 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index a6eae266d..489dd861d 100644
+index a6eae266de..489dd861d2 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -249,6 +249,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index a6eae266d..489dd861d 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 5dc52b6b8..2c28633c4 100644
+index 5dc52b6b89..2c28633c42 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index 5dc52b6b8..2c28633c4 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index 27debcfca..22027321b 100644
+index 27debcfca9..22027321bd 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -182,6 +182,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@@ -101,7 +101,7 @@ index 27debcfca..22027321b 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 dab1be9b6..59b1f9043 100644
+index dab1be9b61..59b1f90433 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -913,6 +913,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -118,7 +118,7 @@ index dab1be9b6..59b1f9043 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 82dfca321..be37eed11 100644
+index 8fb0ecf525..9a5bb02226 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -800,4 +800,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch

@@ -1,11 +1,11 @@
-From 35478e5d1a29397305e7c48247c5fe853074d2a2 Mon Sep 17 00:00:00 2001
+From 6df42e32054107780e490a3e22433d369da2de84 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 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 1ed58f4bb..39d565db1 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,7 +20,7 @@ index 1ed58f4bb..39d565db1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca5212f20..f57c5b6a4 100644
+index 22f757756c..d3551ca681 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -54,7 +54,7 @@ index ca5212f20..f57c5b6a4 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -524,6 +538,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -540,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
@@ -63,7 +63,7 @@ index ca5212f20..f57c5b6a4 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 9000d2d7b..a8a64d054 100644
+index 9000d2d7b2..a8a64d054c 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -193,9 +193,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT

Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch

@@ -1,11 +1,11 @@
-From fa7880f5c79111f17ebb4e4867a538fdb1fcccaa Mon Sep 17 00:00:00 2001
+From dd9bce188d61c465ad634806702418c5a6347418 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index f1e029d33f..2ea2a355ba 100644
+index 210c10b317..2ad3acf43b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
@@ -16,7 +16,7 @@ index f1e029d33f..2ea2a355ba 100644
  
  import org.bukkit.Bukkit;
  import org.bukkit.Material;
-@@ -153,7 +154,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -155,7 +156,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          if (name == null) {
              profile = null;
          } else {
@@ -32,5 +32,5 @@ index f1e029d33f..2ea2a355ba 100644
  
          return true;
 -- 
-2.18.0
+2.20.1
 

Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 634501d0bd202dd5df459b6f2e688c2c98c10bf3 Mon Sep 17 00:00:00 2001
+From 78be8d9e61b91006a198ff15b2269c69ef2348cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 50837d767..898068a81 100644
+index 50837d767f..898068a817 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -195,4 +195,9 @@ public class PaperWorldConfig {
@@ -25,10 +25,10 @@ index 50837d767..898068a81 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f57c5b6a4..dfb7d544f 100644
+index d3551ca681..8676debb50 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2245,6 +2245,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2261,6 +2261,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
@@ -37,7 +37,7 @@ index f57c5b6a4..dfb7d544f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 25982848a..8b8805017 100644
+index 25982848ae..8b88050172 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -538,6 +538,7 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From 5580ed9eca9a0c268f11b3651469a78d5e39ecc4 Mon Sep 17 00:00:00 2001
+From e1acedc383cfa732c086789e173d1d05715642eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 27705106b..da722ec7e 100644
+index d1267f3d72..dcf58e03e4 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -78,7 +78,7 @@ index 27705106b..da722ec7e 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 2ef4ac64b..d1a546c8f 100644
+index 2ef4ac64b2..d1a546c8f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -201,7 +201,7 @@ index 2ef4ac64b..d1a546c8f 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9b31e2d72..1c94fd908 100644
+index 99a2c8c8b1..5e823e1b1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -8,6 +8,7 @@ import java.lang.reflect.Constructor;
@@ -271,8 +271,8 @@ index 9b31e2d72..1c94fd908 100644
  
          for (int i = 0; i < ench.size(); i++) {
              String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT);
-@@ -510,13 +513,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -514,13 +517,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
-     void deserializeInternal(NBTTagCompound tag, Object context) {
+         }
      }
  
 -    static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
@@ -287,7 +287,7 @@ index 9b31e2d72..1c94fd908 100644
          for (Map.Entry<?, ?> entry : ench.entrySet()) {
              // Doctor older enchants
              String enchantKey = entry.getKey().toString();
-@@ -751,13 +754,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -755,13 +758,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
      }
  
      public Map<Enchantment, Integer> getEnchants() {
@@ -303,7 +303,7 @@ index 9b31e2d72..1c94fd908 100644
          }
  
          if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -1084,7 +1087,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1088,7 +1091,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                  clone.lore = new ArrayList<String>(this.lore);
              }
              if (this.enchantments != null) {
@@ -312,7 +312,7 @@ index 9b31e2d72..1c94fd908 100644
              }
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = HashMultimap.create(this.attributeModifiers);
-@@ -1290,6 +1293,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1294,6 +1297,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
      }
  

Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 7b8d0f3c5d696a6fb1857fe8b1f6f1a94cca14ef Mon Sep 17 00:00:00 2001
+From 03c8edd8f0cb69915eb88fa5ec7485b90ea01d5e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -30,10 +30,10 @@ index c2845266e2..795545245a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index b0f93d9cf5..74cf2ab68a 100644
+index e8ce99eb96..feafb82dd3 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -262,7 +262,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
+@@ -261,7 +261,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
  
      protected void f() {
          ++this.despawnCounter;
@@ -43,5 +43,5 @@ index b0f93d9cf5..74cf2ab68a 100644
          }
  
 -- 
-2.19.0
+2.20.1
 

Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From b1a186f233892e1ad57a261ddeeb3264380b4776 Mon Sep 17 00:00:00 2001
+From e2b8529488cc7210a1bbf066ee0ea303a60070b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -8,7 +8,7 @@ Use an optimized method to test if a block position meets a desired light level.
 This method benefits from returning as soon as the desired light level matches.
 
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index fe0dde146..9d53f1118 100644
+index fe0dde1461..9d53f1118c 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -44,7 +44,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
@@ -21,7 +21,7 @@ index fe0dde146..9d53f1118 100644
  
              if (i < this.e()) {
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
-index 81ea9bcb4..291cc9a39 100644
+index 81ea9bcb4f..291cc9a398 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
 +++ b/src/main/java/net/minecraft/server/BlockSapling.java
 @@ -30,7 +30,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -34,7 +34,7 @@ index 81ea9bcb4..291cc9a39 100644
              world.captureTreeGeneration = true;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 53f091835..f8dda1b7a 100644
+index 53f091835c..f8dda1b7a1 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -27,7 +27,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -47,7 +47,7 @@ index 53f091835..f8dda1b7a 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 5ea517043..dc61263a3 100644
+index 5ea5170436..dc61263a3f 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -66,9 +66,18 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
@@ -73,10 +73,10 @@ index 5ea517043..dc61263a3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 4078a94de..5bba50461 100644
+index 002be7f7be..7a943a6c27 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -275,7 +275,7 @@ public class EntityZombie extends EntityMonster {
+@@ -267,7 +267,7 @@ public class EntityZombie extends EntityMonster {
                      int j1 = j + MathHelper.nextInt(this.random, 7, 40) * MathHelper.nextInt(this.random, -1, 1);
                      int k1 = k + MathHelper.nextInt(this.random, 7, 40) * MathHelper.nextInt(this.random, -1, 1);
  

Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch

@@ -1,4 +1,4 @@
-From 5549de94f03b62911fa4c033daa064f1dcde508d Mon Sep 17 00:00:00 2001
+From 6bf9bcfab1a26cd84e99700cbbb5204b607685e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 ab46ae8c3..f7a7ba412 100644
+index a66e5c5543..e87b6b8c1a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2560,7 +2560,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2576,7 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public Entity teleportTo(Location exit, boolean portal) {

Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch

@@ -1,16 +1,16 @@
-From e39ea75f06d5a7f85143686fa4f1ebc0e8964f93 Mon Sep 17 00:00:00 2001
+From 328a66aaf0b160765b9bb444a220a78a3cc9ca06 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 6cbe069562..7b62f26d7c 100644
+index 2273f213cb..60446f2478 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -250,4 +250,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
      public void setBootsDropChance(float chance) {
-         throw new UnsupportedOperationException();
+         throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
      }
 +
 +    // Paper start
@@ -64,5 +64,5 @@ index 6cbe069562..7b62f26d7c 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.1
 

Spigot-Server-Patches/0115-Activation-Range-Improvements.patch

@@ -1,4 +1,4 @@
-From 60e23e8bb0a197dc11f3d6facbbda7029175567d Mon Sep 17 00:00:00 2001
+From 06835ff658a91c3e94a1f43d6bcd64bdf200a253 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 507c93804..a4c282220 100644
+index dfd7496c7c..052e11606d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -387,6 +387,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -22,10 +22,10 @@ index 507c93804..a4c282220 100644
              return new BlockPosition(this);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 583cee415..192f0aedd 100644
+index c7737b068b..d004f7e620 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -573,6 +573,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -589,6 +589,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.recalcPosition();
          } else {
              if (enummovetype == EnumMoveType.PISTON) {
@@ -34,7 +34,7 @@ index 583cee415..192f0aedd 100644
  
                  if (i != this.aM) {
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 20b7c2c6d..d659c57db 100644
+index 20b7c2c6dc..d659c57dbe 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -46,7 +46,7 @@ index 20b7c2c6d..d659c57db 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 4809af8f0..7401bafa9 100644
+index e5322de974..c530824596 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -105,6 +105,17 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -68,7 +68,7 @@ index 4809af8f0..7401bafa9 100644
          return this.moveController;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fe1c5a49b..f58ebe3c2 100644
+index fe1c5a49ba..f58ebe3c23 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
@@ -81,7 +81,7 @@ index fe1c5a49b..f58ebe3c2 100644
      protected int ticksFarFromPlayer;
      protected float aZ;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index b19bd2b99..5e1976871 100644
+index b19bd2b99a..5e19768710 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -93,7 +93,7 @@ index b19bd2b99..5e1976871 100644
          return this.bQ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index a146a8b45..a19853463 100644
+index a146a8b459..a19853463c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -109,7 +109,7 @@ index a146a8b45..a19853463 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index d5c08aa7c..756d63239 100644
+index d5c08aa7cb..756d63239c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,12 +2,12 @@ package net.minecraft.server;
@@ -150,7 +150,7 @@ index d5c08aa7c..756d63239 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index f3df91181..3e2f9c749 100644
+index f3df91181f..3e2f9c749b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -11,10 +11,10 @@ public class PathfinderGoalSelector {
@@ -189,7 +189,7 @@ index f3df91181..3e2f9c749 100644
          Iterator iterator = this.b.iterator();
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 09df00e94..d08ef3fe1 100644
+index 09df00e94b..d08ef3fe10 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
@@ -387,7 +387,7 @@ index 09df00e94..d08ef3fe1 100644
          {
              isActive = false;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index d3c2abc39..1d222eaff 100644
+index d3c2abc398..1d222eaff7 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -150,12 +150,14 @@ public class SpigotWorldConfig

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

@@ -1,11 +1,11 @@
-From 7fb2a84b0018e12e30e3700bdaaa688f9bed0c33 Mon Sep 17 00:00:00 2001
+From ecbdae558178b3ed72ee383494b9241989cb4db6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 00f0451ef..42d951554 100644
+index 00f0451ef8..42d9515542 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,10 +32,10 @@ index 00f0451ef..42d951554 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 192f0aedd..0004c134a 100644
+index d004f7e620..a2e795bc28 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1171,6 +1171,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1187,6 +1187,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean aq() {
@@ -48,7 +48,7 @@ index 192f0aedd..0004c134a 100644
          return this.isInWater() || this.q();
      }
  
-@@ -2722,6 +2728,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2738,6 +2744,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bw() {
@@ -61,7 +61,7 @@ index 192f0aedd..0004c134a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 2c28633c4..e5170b4e6 100644
+index 2c28633c42..e5170b4e6b 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {

Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch

@@ -1,14 +1,14 @@
-From d992aa01580dba844d13df4bfbda539e8591d7f9 Mon Sep 17 00:00:00 2001
+From 03fec54dc977d5a0cb70e31330a235e119d12796 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 6dee9e169..2aaa27789 100644
+index feafb82dd3..6aa518f17f 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -195,6 +195,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
+@@ -194,6 +194,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
                  }
              }
  
@@ -26,7 +26,7 @@ index 6dee9e169..2aaa27789 100644
                  this.a(movingobjectposition);
                  this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 3e3619d79..58cc4824c 100644
+index 3e3619d79f..58cc4824cf 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -68,6 +68,15 @@ public abstract class EntityFireball extends Entity {
@@ -46,7 +46,7 @@ index 3e3619d79..58cc4824c 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 16aa2b5f2..23f7d36b5 100644
+index 16aa2b5f25..23f7d36b55 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -245,6 +245,16 @@ public class EntityFishingHook extends Entity {
@@ -67,7 +67,7 @@ index 16aa2b5f2..23f7d36b5 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 751ea456b..bab5b89fe 100644
+index 751ea456b9..bab5b89fe9 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -144,6 +144,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -87,7 +87,7 @@ index 751ea456b..bab5b89fe 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.getBlockPosition()).getBlock() == Blocks.NETHER_PORTAL) {
                  this.e(movingobjectposition.getBlockPosition());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b38639556..866dee45b 100644
+index b386395560..866dee45b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -974,6 +974,16 @@ public class CraftEventFactory {

Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch

@@ -1,14 +1,14 @@
-From 5161bfd916603c9f4b61d3553565fe0d8f4e744b Mon Sep 17 00:00:00 2001
+From 454ed699339b0c9dd1c5e881c4ce5ef50fe94f60 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 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 40704664b..e1944774c 100644
+index 7c91bfbb78..f9973a3637 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2075,6 +2075,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2091,6 +2091,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit

Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch

@@ -1,11 +1,11 @@
-From 70628488385eecbef6b1292f7d89b5eb811a9526 Mon Sep 17 00:00:00 2001
+From a15e970ed18cc79400d6dbbcdcf1d95d5ff86582 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 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 e80e7936a..58fffcaca 100644
+index 4be9226c8e..e64d032b7f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index e80e7936a..58fffcaca 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1648,6 +1649,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1664,6 +1665,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 e80e7936a..58fffcaca 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1795,6 +1800,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1811,6 +1816,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 e80e7936a..58fffcaca 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 ce43b4bc5..98065d6b0 100644
+index ce43b4bc52..98065d6b02 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 {
@@ -49,7 +49,7 @@ index ce43b4bc5..98065d6b0 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c3096d87e..8b0f530ba 100644
+index a82717f5c1..67530ba0fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -839,5 +839,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch

@@ -1,4 +1,4 @@
-From 9aa37315aed4ddfdf70e53317d110d12eb948049 Mon Sep 17 00:00:00 2001
+From ca5edd7300c8cf5a4f6d2ead581cf00d80abd193 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index 110e04597..c260af11c 100644
+index 110e04597b..c260af11cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 @@ -1,5 +1,7 @@
@@ -48,7 +48,7 @@ index 110e04597..c260af11c 100644
      public BlockFace getRotation() {
          BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 2ea2a355b..398cf958c 100644
+index 2ad3acf43b..87e51cf8ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -69,7 +69,7 @@ index 2ea2a355b..398cf958c 100644
  @DelegateDeserialization(SerializableMeta.class)
  class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
-@@ -131,6 +135,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -133,6 +137,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          return hasOwner() ? profile.getName() : null;
      }
  
@@ -90,5 +90,5 @@ index 2ea2a355b..398cf958c 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.20.0
+2.20.1
 

Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From 2993601294994d6c7a4ce83f3e427f21cc9c5cdd Mon Sep 17 00:00:00 2001
+From d898f4b24d93bb4bdaedd2bbf416659bd0fc9fa8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 3a6e6f687..6a86cb7eb 100644
+index 3a6e6f687d..6a86cb7eb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -191,6 +191,8 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index 3a6e6f687..6a86cb7eb 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index d1a546c8f..284630f74 100644
+index d1a546c8f0..284630f74e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -403,6 +403,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index d1a546c8f..284630f74 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 000000000..c00b89c8d
+index 0000000000..c00b89c8d4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,311 @@
@@ -356,7 +356,7 @@ index 000000000..c00b89c8d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 1c94fd908..05d3ff969 100644
+index 5e823e1b1a..eaf4cd11c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -155,6 +155,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -367,7 +367,7 @@ index 1c94fd908..05d3ff969 100644
                      .put(CraftMetaItem.class, "UNSPECIFIC")
                      .build();
  
-@@ -1286,7 +1287,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1290,7 +1291,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                          CraftMetaCharge.EXPLOSION.NBT,
                          CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,
                          CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
@@ -385,7 +385,7 @@ index 1c94fd908..05d3ff969 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 65b8123a8..0ad0004b9 100644
+index 65b8123a8b..0ad0004b9f 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -8,6 +8,7 @@ import java.util.Arrays;

Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch

@@ -1,4 +1,4 @@
-From 23465974e577d60e2d1a9cd5a17a92482937de18 Mon Sep 17 00:00:00 2001
+From d997ef86055ea6799457b447b3a0afd5919a94fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 58fffcaca..469fea837 100644
+index e64d032b7f..f54e9784c4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2592,7 +2592,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2608,7 +2608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end */
  
@@ -35,7 +35,7 @@ index 58fffcaca..469fea837 100644
              this.world.methodProfiler.enter("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 2920a276c..a30b8e2cb 100644
+index 2920a276ca..a30b8e2cb3 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -998,6 +998,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -1,4 +1,4 @@
-From 6707b69e2360665a4ff5550a008be9ddf04030d3 Mon Sep 17 00:00:00 2001
+From 3be76f44a3248e38ff54a3107a9914c9efd41240 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,10 +6,10 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index 4bf6fd083..566846eb0 100644
+index 749a8a5272..6e2ee04c77 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-@@ -160,7 +160,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
+@@ -152,7 +152,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
  
          entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
          // CraftBukkit start
@@ -19,10 +19,10 @@ index 4bf6fd083..566846eb0 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index b0f7649b8..152b179ce 100644
+index 6934114005..52bc68e6a6 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
-@@ -57,6 +57,7 @@ public class ItemBow extends Item {
+@@ -55,6 +55,7 @@ public class ItemBow extends Item {
                  if ((double) f >= 0.1D) {
                      boolean flag1 = flag && itemstack1.getItem() == Items.ARROW;
  
@@ -30,8 +30,8 @@ index b0f7649b8..152b179ce 100644
                      if (!world.isClientSide) {
                          ItemArrow itemarrow = (ItemArrow) ((ItemArrow) (itemstack1.getItem() instanceof ItemArrow ? itemstack1.getItem() : Items.ARROW));
                          EntityArrow entityarrow = itemarrow.a(world, itemstack1, (EntityLiving) entityhuman);
-@@ -89,14 +90,15 @@ public class ItemBow extends Item {
+@@ -80,7 +81,7 @@ public class ItemBow extends Item {
-                         // CraftBukkit end
+                             entityarrow.setOnFire(100);
                          }
                          // CraftBukkit start
 -                        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityhuman, itemstack, entityarrow, f);
@@ -39,7 +39,8 @@ index b0f7649b8..152b179ce 100644
                          if (event.isCancelled()) {
                              event.getProjectile().remove();
                              return;
-                         }
+@@ -88,7 +89,8 @@ public class ItemBow extends Item {
+                         // CraftBukkit end
  
                          itemstack.damage(1, entityhuman);
 -                        if (flag1 || entityhuman.abilities.canInstantlyBuild && (itemstack1.getItem() == Items.SPECTRAL_ARROW || itemstack1.getItem() == Items.TIPPED_ARROW)) {
@@ -48,7 +49,7 @@ index b0f7649b8..152b179ce 100644
                              entityarrow.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
                          }
  
-@@ -112,7 +114,7 @@ public class ItemBow extends Item {
+@@ -105,7 +107,7 @@ public class ItemBow extends Item {
                      }
  
                      world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (ItemBow.i.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
@@ -58,7 +59,7 @@ index b0f7649b8..152b179ce 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8d12155c3..3f17fbd37 100644
+index e240c50bc3..edafaf0de7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -327,7 +327,7 @@ public class CraftEventFactory {
@@ -80,5 +81,5 @@ index 8d12155c3..3f17fbd37 100644
  
          return event;
 -- 
-2.20.0
+2.20.1
 

Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch

@@ -1,4 +1,4 @@
-From 763454b873fec72403fa9d124df105c9daf6be35 Mon Sep 17 00:00:00 2001
+From a2615ce98c342a8618229c37ff2b050ac3e8789d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,17 +7,18 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 1eadc4371..80f112d99 100644
+index 52bc68e6a6..f8dbc3c400 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,7 @@
  package net.minecraft.server;
  
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
- import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
++
- 
  public class ItemBow extends Item {
-@@ -18,16 +19,16 @@ public class ItemBow extends Item {
+ 
+     public ItemBow(Item.Info item_info) {
+@@ -16,16 +18,16 @@ public class ItemBow extends Item {
          // CraftBukkit end
      }
  
@@ -38,7 +39,7 @@ index 1eadc4371..80f112d99 100644
                      return itemstack;
                  }
              }
-@@ -36,15 +37,23 @@ public class ItemBow extends Item {
+@@ -34,15 +36,23 @@ public class ItemBow extends Item {
          }
      }
  
@@ -65,7 +66,7 @@ index 1eadc4371..80f112d99 100644
  
              if (!itemstack1.isEmpty() || flag) {
                  if (itemstack1.isEmpty()) {
-@@ -148,7 +157,7 @@ public class ItemBow extends Item {
+@@ -141,7 +151,7 @@ public class ItemBow extends Item {
  
      public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
          ItemStack itemstack = entityhuman.b(enumhand);

Spigot-Server-Patches/0290-add-more-information-to-Entity.toString.patch

@@ -1,4 +1,4 @@
-From 12b4c5e65ba1a4454c7f301123063d17b058213f Mon Sep 17 00:00:00 2001
+From aea6c165a8325f3a2c90a5f0fc0a949b94756704 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 df7a1a47e..969e43ed1 100644
+index f54e9784c4..1b76a8e25e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2495,7 +2495,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2511,7 +2511,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {

Spigot-Server-Patches/0295-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From 6ffac86b5ce51590fc9886bcfaf65c4ba78b7f78 Mon Sep 17 00:00:00 2001
+From a26662d070c24ebf90d5d8f440e20d12cf04e5cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92acfa6fb..05509e4fd 100644
+index 92acfa6fb8..05509e4fdb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -454,4 +454,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 92acfa6fb..05509e4fd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1c1f39524..edae53b82 100644
+index 1c1f39524d..edae53b825 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -163,10 +163,10 @@ index 1c1f39524..edae53b82 100644
              // CraftBukkit start
              List<Entity> toRemove = new LinkedList<>();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index aee88f718..1b5663e52 100644
+index 5701f535e4..e16fd4e5e9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2720,6 +2720,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2736,6 +2736,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
@@ -175,7 +175,7 @@ index aee88f718..1b5663e52 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 601fe77c5..4df291f0d 100644
+index 601fe77c51..4df291f0d6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -70,7 +70,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -188,7 +188,7 @@ index 601fe77c5..4df291f0d 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> c = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a4895bd55..a896f8fe4 100644
+index a4895bd55d..a896f8fe46 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -37,7 +37,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/0304-EntityTransformedEvent.patch

@@ -1,11 +1,11 @@
-From a787531bca729b1e9196c01ce456cd7f7ad2f234 Mon Sep 17 00:00:00 2001
+From ba0abba634bf17f22948e04ef7b4402e6643581e Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 141c17bf8..dde9f1e61 100644
+index 141c17bf80..dde9f1e61e 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -53,6 +53,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 141c17bf8..dde9f1e61 100644
  
                  this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 78acac4ca..f01e776fe 100644
+index 78acac4ca7..f01e776fe5 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -624,6 +624,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -29,10 +29,10 @@ index 78acac4ca..f01e776fe 100644
              // CraftBukkit end
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 5bba50461..33b343c14 100644
+index 7a943a6c27..7998b80c17 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
+@@ -239,6 +239,7 @@ public class EntityZombie extends EntityMonster {
                  return;
              }
              // CraftBukkit end
@@ -40,7 +40,7 @@ index 5bba50461..33b343c14 100644
              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.DROWNED); // CraftBukkit - added spawn reason
              this.die();
          }
-@@ -409,6 +410,7 @@ public class EntityZombie extends EntityMonster {
+@@ -401,6 +402,7 @@ public class EntityZombie extends EntityMonster {
              if (CraftEventFactory.callEntityTransformEvent(this, entityzombievillager, EntityTransformEvent.TransformReason.INFECTION).isCancelled()) {
                  return;
              }
@@ -49,7 +49,7 @@ index 5bba50461..33b343c14 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index c6198626a..86e5fbcda 100644
+index c6198626ab..86e5fbcdab 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -139,6 +139,7 @@ public class EntityZombieVillager extends EntityZombie {

Spigot-Server-Patches/0350-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch

@@ -1,4 +1,4 @@
-From 12e96fa13e82f5b001e6e3ee87ad4a4c347f022e Mon Sep 17 00:00:00 2001
+From df43f5561ed43c61c0631fd2b3fd38677ff38936 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 4 Sep 2018 19:07:57 -0400
 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
@@ -23,7 +23,7 @@ This reasoning leads us to one clear conclusion: The simplest, least invasive, a
 store the AABB in NBT data on chunk save and restore the AABB exactly as it was saved upon reload.
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 1c0b783e8..c5e541985 100644
+index 1c0b783e8e..c5e541985f 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -5,12 +5,12 @@ import javax.annotation.Nullable;
@@ -46,10 +46,10 @@ index 1c0b783e8..c5e541985 100644
      public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) {
          this.minX = 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 3311e2b24..2e2d14d93 100644
+index c29d7eeb0a..6b65c69423 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1657,6 +1657,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1673,6 +1673,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
              }
@@ -62,7 +62,7 @@ index 3311e2b24..2e2d14d93 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1746,6 +1752,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1762,6 +1768,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.aD()) {
                  this.setPosition(this.locX, this.locY, this.locZ);
              }
@@ -79,7 +79,7 @@ index 3311e2b24..2e2d14d93 100644
  
              // CraftBukkit start
              if (this instanceof EntityLiving) {
-@@ -2814,6 +2830,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2830,6 +2846,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.boundingBox;
      }
  

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

@@ -1,4 +1,4 @@
-From 5487350de6114e69b63b7eb168525c884f3a805e Mon Sep 17 00:00:00 2001
+From a5f10a2a464cd37f4f98d428ea9bb5ad5752c091 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,10 +27,10 @@ index bbd5e2b2a8..19750ceed1 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2e2d14d932..e068f19ade 100644
+index 6b65c69423..9eb280adc5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1537,6 +1537,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1553,6 +1553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -38,7 +38,7 @@ index 2e2d14d932..e068f19ade 100644
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2405,6 +2406,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2421,6 +2422,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
@@ -46,7 +46,7 @@ index 2e2d14d932..e068f19ade 100644
      public void b(EntityLiving entityliving) {}
  
      protected boolean i(double d0, double d1, double d2) {
-@@ -3070,6 +3072,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3086,6 +3088,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return EnumPistonReaction.NORMAL;
      }
  
@@ -284,7 +284,7 @@ index 17fab031b4..ee8219e3ba 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0503d7cf47..5e3f30f52f 100644
+index 07b9545e76..a2eae5d10c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1686,7 +1686,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -305,7 +305,7 @@ index 0503d7cf47..5e3f30f52f 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a2841ee535..fdab6734f8 100644
+index da1fc58930..58ebecefe0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -595,9 +595,16 @@ public class CraftEventFactory {

Spigot-Server-Patches/0355-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch

@@ -1,11 +1,11 @@
-From 90c9ee725b4fffd131bac4d977adf6231b83bf2f Mon Sep 17 00:00:00 2001
+From 3d7a3196483b58cc78e94b6ee53f867335269418 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 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/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 8e8390282..f52936581 100644
+index 8e8390282d..f529365817 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,7 +32,7 @@ index 8e8390282..f52936581 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 05d3ff969..1a0c0efdc 100644
+index eaf4cd11c4..03644365ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -81,6 +81,12 @@ import javax.annotation.Nullable;
@@ -157,7 +157,7 @@ index 05d3ff969..1a0c0efdc 100644
          String internal = SerializableMeta.getString(map, "internal", true);
          if (internal != null) {
              ByteArrayInputStream buf = new ByteArrayInputStream(Base64.decodeBase64(internal));
-@@ -604,6 +684,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -608,6 +688,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          if (hasDamage()) {
              itemTag.setInt(DAMAGE.NBT, damage);
          }
@@ -181,7 +181,7 @@ index 05d3ff969..1a0c0efdc 100644
  
          for (Map.Entry<String, NBTBase> e : unhandledTags.entrySet()) {
              itemTag.set(e.getKey(), e.getValue());
-@@ -702,7 +799,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -706,7 +803,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
  
      @Overridden
      boolean isEmpty() {
@@ -191,7 +191,7 @@ index 05d3ff969..1a0c0efdc 100644
      }
  
      public String getDisplayName() {
-@@ -1044,7 +1142,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1048,7 +1146,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                  && (this.publicItemTagContainer.equals(that.publicItemTagContainer))
                  && (this.hideFlag == that.hideFlag)
                  && (this.isUnbreakable() == that.isUnbreakable())
@@ -204,7 +204,7 @@ index 05d3ff969..1a0c0efdc 100644
      }
  
      /**
-@@ -1076,6 +1178,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1080,6 +1182,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          hash = 61 * hash + (isUnbreakable() ? 1231 : 1237);
          hash = 61 * hash + (hasDamage() ? this.damage : 0);
          hash = 61 * hash + (hasAttributeModifiers() ? this.attributeModifiers.hashCode() : 0);
@@ -215,7 +215,7 @@ index 05d3ff969..1a0c0efdc 100644
          return hash;
      }
  
-@@ -1096,6 +1202,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1100,6 +1206,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
              clone.hideFlag = this.hideFlag;
              clone.unbreakable = this.unbreakable;
              clone.damage = this.damage;
@@ -231,7 +231,7 @@ index 05d3ff969..1a0c0efdc 100644
              return clone;
          } catch (CloneNotSupportedException e) {
              throw new Error(e);
-@@ -1145,6 +1260,24 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1149,6 +1264,24 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
              builder.put(DAMAGE.BUKKIT, damage);
          }
  
@@ -256,7 +256,7 @@ index 05d3ff969..1a0c0efdc 100644
          final Map<String, NBTBase> internalTags = new HashMap<String, NBTBase>(unhandledTags);
          serializeInternal(internalTags);
          if (!internalTags.isEmpty()) {
-@@ -1294,7 +1427,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1298,7 +1431,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
                          CraftMetaArmorStand.NO_BASE_PLATE.NBT,
                          CraftMetaArmorStand.SHOW_ARMS.NBT,
                          CraftMetaArmorStand.SMALL.NBT,
@@ -267,7 +267,7 @@ index 05d3ff969..1a0c0efdc 100644
                          // Paper end
                  ));
              }
-@@ -1341,4 +1476,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
+@@ -1345,4 +1480,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          return spigot;
      }
      // Spigot end

Spigot-Server-Patches/0364-Catch-JsonParseException-in-Entity-and-TE-names.patch

@@ -1,4 +1,4 @@
-From 8f02a69ad91906228ca3411197f3486dcbe5cae3 Mon Sep 17 00:00:00 2001
+From b24f25ca79e8d769b321b513c83b4c7c2fabe1f2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index e38a0d488..a245df1dc 100644
+index e38a0d488e..a245df1dce 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,10 +26,10 @@ index e38a0d488..a245df1dc 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 e068f19ad..11d5c2655 100644
+index 9eb280adc5..a4c5b0b5b5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1732,7 +1732,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1748,7 +1748,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.setPosition(this.locX, this.locY, this.locZ);
              this.setYawPitch(this.yaw, this.pitch);
              if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
@@ -39,7 +39,7 @@ index e068f19ad..11d5c2655 100644
  
              this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 0ef5ad116..f70f5899f 100644
+index 0ef5ad1165..f70f5899fa 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -339,4 +339,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 0ef5ad116..f70f5899f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 7d9e0837d..dfee7332e 100644
+index 7d9e0837d8..dfee7332ea 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -74,7 +74,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 7d9e0837d..dfee7332e 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
-index a106a783e..ff8a5926e 100644
+index a106a783eb..ff8a5926e1 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 @@ -236,7 +236,7 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl
@@ -89,7 +89,7 @@ index a106a783e..ff8a5926e 100644
  
          this.fuelLevel = nbttagcompound.getByte("Fuel");
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 2e0f782f6..77c012946 100644
+index 2e0f782f65..77c012946a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -83,7 +83,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@@ -102,7 +102,7 @@ index 2e0f782f6..77c012946 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityDispenser.java b/src/main/java/net/minecraft/server/TileEntityDispenser.java
-index ddd2e0eb0..21bd156e9 100644
+index ddd2e0eb0b..21bd156e91 100644
 --- a/src/main/java/net/minecraft/server/TileEntityDispenser.java
 +++ b/src/main/java/net/minecraft/server/TileEntityDispenser.java
 @@ -107,7 +107,7 @@ public class TileEntityDispenser extends TileEntityLootable {
@@ -115,7 +115,7 @@ index ddd2e0eb0..21bd156e9 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index bfbd35bbe..538ca9bbb 100644
+index bfbd35bbe5..538ca9bbb4 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -217,7 +217,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve
@@ -128,7 +128,7 @@ index bfbd35bbe..538ca9bbb 100644
  
          // Paper start - cook speed API
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 7303a6fdd..544dde428 100644
+index 7303a6fdda..544dde4289 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -60,7 +60,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -141,7 +141,7 @@ index 7303a6fdd..544dde428 100644
  
          this.f = nbttagcompound.getInt("TransferCooldown");
 diff --git a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
-index fedba2e1f..296b8dd56 100644
+index fedba2e1fd..296b8dd56d 100644
 --- a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 @@ -249,7 +249,7 @@ public class TileEntityShulkerBox extends TileEntityLootable implements IWorldIn

Spigot-Server-Patches/0368-Ignore-Dimension-NBT-field-in-Entity-data.patch

@@ -1,4 +1,4 @@
-From 5b9dec412f331eefc59865a3263542e3b2b9dc84 Mon Sep 17 00:00:00 2001
+From 734f143e67284eec0c47f931c238cd6c1572b8cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,10 +14,10 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 80e395b1a..f26056dd5 100644
+index b572e535ac..66947e3071 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1719,7 +1719,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1735,7 +1735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.setAirTicks(nbttagcompound.getShort("Air"));
              this.onGround = nbttagcompound.getBoolean("OnGround");
              if (nbttagcompound.hasKey("Dimension")) {

Spigot-Server-Patches/0378-Add-LivingEntity-getTargetEntity.patch

@@ -1,11 +1,11 @@
-From 22d4b81ba25bdc12d01a51f36099eb14376de6ae Mon Sep 17 00:00:00 2001
+From 65cde9b271841fc052d367034a96e2e6c7d1a003 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index c5e541985..d6a5c7407 100644
+index c5e541985f..d6a5c74079 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -95,6 +95,7 @@ public class AxisAlignedBB {
@@ -46,10 +46,10 @@ index c5e541985..d6a5c7407 100644
      public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
          return this.a(vec3d, vec3d1, (BlockPosition) null);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f26056dd5..35715e434 100644
+index 66947e3071..2f27af7f6e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1517,6 +1517,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1533,6 +1533,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return new Vec3D((double) (f5 * f6), (double) (-f7), (double) (f4 * f6));
      }
  
@@ -57,7 +57,7 @@ index f26056dd5..35715e434 100644
      public Vec3D i(float f) {
          if (f == 1.0F) {
              return new Vec3D(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ);
-@@ -2180,10 +2181,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2196,10 +2197,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.bP().size() < 1;
      }
  
@@ -71,7 +71,7 @@ index f26056dd5..35715e434 100644
          return this.d(this.pitch, this.yaw);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 60aaf0547..710ad8b17 100644
+index 60aaf05475..710ad8b176 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -130,7 +130,7 @@ index 60aaf0547..710ad8b17 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index f6916fd45..71f08d53c 100644
+index f6916fd455..71f08d53c7 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -19,6 +19,7 @@ public final class IEntitySelector {
@@ -142,7 +142,7 @@ index f6916fd45..71f08d53c 100644
          return !(entity instanceof EntityHuman) || !((EntityHuman) entity).isSpectator();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index eeab59379..d6a4bc64a 100644
+index eeab59379a..d6a4bc64ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -186,6 +186,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

Spigot-Server-Patches/0392-Reset-players-airTicks-on-respawn.patch

@@ -1,14 +1,14 @@
-From 907c7f46d7b33852e40409840a1baaf0d44cba52 Mon Sep 17 00:00:00 2001
+From 8b820548136c25c0c0e890907bc9fa2415b81608 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 35715e434..9f9eaf25c 100644
+index 2f27af7f6e..e448f08930 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2332,7 +2332,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2348,7 +2348,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -18,7 +18,7 @@ index 35715e434..9f9eaf25c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bd768e170..71c4ed8fa 100644
+index bd768e170c..71c4ed8fa6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1620,6 +1620,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0396-Use-EntityTypes-for-living-entities.patch

@@ -1,11 +1,11 @@
-From 2c033e9736a0e3726126d35a7cbd0b0731cffadf Mon Sep 17 00:00:00 2001
+From 645b315ae59d67507f97c647929076ef982fb12e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
-index 5a0cc6d05..d385f647e 100644
+index 5a0cc6d058..d385f647e7 100644
 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 @@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@@ -18,7 +18,7 @@ index 5a0cc6d05..d385f647e 100644
              entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
              world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index 75622fbdf..265369984 100644
+index 75622fbdf8..2653699840 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 @@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@@ -40,7 +40,7 @@ index 75622fbdf..265369984 100644
                  entityirongolem.setPlayerCreated(true);
                  entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index d2cc6bbe2..b180772ae 100644
+index d2cc6bbe25..b180772ae8 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block {
@@ -53,7 +53,7 @@ index d2cc6bbe2..b180772ae 100644
                          entityturtle.setAgeRaw(-24000);
                          entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 93bf32dc1..e6063bb46 100644
+index 93bf32dc1a..e6063bb462 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
 @@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@@ -66,7 +66,7 @@ index 93bf32dc1..e6063bb46 100644
  
                  entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index aad7ce93f..09eabf123 100644
+index aad7ce93f6..09eabf1235 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -412,7 +412,7 @@ public class EnderDragonBattle {
@@ -79,7 +79,7 @@ index aad7ce93f..09eabf123 100644
          entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.HOLDING_PATTERN);
          entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index ee159e0a8..070a9e7b1 100644
+index ee159e0a81..070a9e7b14 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@@ -92,7 +92,7 @@ index ee159e0a8..070a9e7b1 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5874d2993..cc53e915d 100644
+index 5874d2993c..cc53e915d7 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@@ -105,7 +105,7 @@ index 5874d2993..cc53e915d 100644
  
      public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 961afa5c4..a372f6508 100644
+index 961afa5c42..a372f6508f 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
 @@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@@ -118,7 +118,7 @@ index 961afa5c4..a372f6508 100644
                              entityendermite.setPlayerSpawned(true);
                              entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 963b6fbb9..fc20bbe27 100644
+index 963b6fbb9c..fc20bbe272 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -188,8 +188,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -132,7 +132,7 @@ index 963b6fbb9..fc20bbe27 100644
                  entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
                  entityvex.a((EntityInsentient) EntityEvoker.this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 4e8a97c55..1b9425f3e 100644
+index 4e8a97c557..1b9425f3e6 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -208,11 +208,11 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -150,7 +150,7 @@ index 4e8a97c55..1b9425f3e 100644
              int j;
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 72eed22eb..65c40e72b 100644
+index 72eed22eb9..65c40e72bf 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -33,7 +33,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -163,7 +163,7 @@ index 72eed22eb..65c40e72b 100644
          this.a(entityageable, (EntityHorseAbstract) object);
          return (EntityAgeable) object;
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index eae2b2665..0a092acdf 100644
+index eae2b26655..0a092acdfe 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -176,7 +176,7 @@ index eae2b2665..0a092acdf 100644
  
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index c23bc72fc..a1873f557 100644
+index c23bc72fc8..a1873f557c 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -41,7 +41,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -189,7 +189,7 @@ index c23bc72fc..a1873f557 100644
  
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 5e1976871..82a32c61e 100644
+index 5e19768710..82a32c61ed 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -285,7 +285,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -202,7 +202,7 @@ index 5e1976871..82a32c61e 100644
          this.a(entityageable, (EntityHorseAbstract) entityllama);
          EntityLlama entityllama1 = (EntityLlama) entityageable;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index dde9f1e61..638dbe978 100644
+index dde9f1e61e..638dbe978d 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -40,7 +40,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -224,7 +224,7 @@ index dde9f1e61..638dbe978 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index ba074c10c..13c84bda8 100644
+index ba074c10c6..13c84bda84 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -246,7 +246,7 @@ index ba074c10c..13c84bda8 100644
                  entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                  entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 9dc2d8be2..d1689dc33 100644
+index 9dc2d8be27..d1689dc33a 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -153,7 +153,7 @@ public class EntityPig extends EntityAnimal {
@@ -268,7 +268,7 @@ index 9dc2d8be2..d1689dc33 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index a02020d5f..dbb534c9c 100644
+index a02020d5fc..dbb534c9cd 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -18,7 +18,7 @@ public class EntityPolarBear extends EntityAnimal {
@@ -281,7 +281,7 @@ index a02020d5f..dbb534c9c 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index e545b1c9b..d6bac06a7 100644
+index e545b1c9b3..d6bac06a7a 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -294,7 +294,7 @@ index e545b1c9b..d6bac06a7 100644
  
          if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index f7a25c148..c35d1eef4 100644
+index f7a25c1483..c35d1eef43 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -247,7 +247,7 @@ public class EntitySheep extends EntityAnimal {
@@ -307,7 +307,7 @@ index f7a25c148..c35d1eef4 100644
          entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
          return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index a42b8d554..9ef1c9baf 100644
+index a42b8d554f..9ef1c9baf2 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@@ -320,7 +320,7 @@ index a42b8d554..9ef1c9baf 100644
              entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
              entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index a533e0eb5..270b95082 100644
+index a533e0eb5b..270b950820 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -333,7 +333,7 @@ index a533e0eb5..270b95082 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index d74bfa120..24ca35119 100644
+index d74bfa1201..24ca351194 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@@ -345,7 +345,7 @@ index d74bfa120..24ca35119 100644
      public T a(World world) {
          return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f01e776fe..40b3ffd8c 100644
+index f01e776fe5..40b3ffd8ca 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -592,7 +592,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -367,7 +367,7 @@ index f01e776fe..40b3ffd8c 100644
              // Paper start
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 4f1696d01..46d8e0a1f 100644
+index 4f1696d018..46d8e0a1f4 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -342,7 +342,7 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -380,10 +380,10 @@ index 4f1696d01..46d8e0a1f 100644
  
          if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 33b343c14..92ad1ad15 100644
+index 7998b80c17..81cc0c3b33 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -216,7 +216,7 @@ public class EntityZombie extends EntityMonster {
+@@ -208,7 +208,7 @@ public class EntityZombie extends EntityMonster {
      }
  
      protected void dE() {
@@ -392,7 +392,7 @@ index 33b343c14..92ad1ad15 100644
          this.world.a((EntityHuman) null, 1040, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
      }
  
-@@ -269,7 +269,7 @@ public class EntityZombie extends EntityMonster {
+@@ -261,7 +261,7 @@ public class EntityZombie extends EntityMonster {
                  int i = MathHelper.floor(this.locX);
                  int j = MathHelper.floor(this.locY);
                  int k = MathHelper.floor(this.locZ);
@@ -401,7 +401,7 @@ index 33b343c14..92ad1ad15 100644
  
                  for (int l = 0; l < 50; ++l) {
                      int i1 = i + MathHelper.nextInt(this.random, 7, 40) * MathHelper.nextInt(this.random, -1, 1);
-@@ -393,7 +393,7 @@ public class EntityZombie extends EntityMonster {
+@@ -385,7 +385,7 @@ public class EntityZombie extends EntityMonster {
              }
  
              EntityVillager entityvillager = (EntityVillager) entityliving;
@@ -410,7 +410,7 @@ index 33b343c14..92ad1ad15 100644
  
              entityzombievillager.u(entityvillager);
              // this.world.kill(entityvillager); // CraftBukkit - moved down
-@@ -458,7 +458,7 @@ public class EntityZombie extends EntityMonster {
+@@ -450,7 +450,7 @@ public class EntityZombie extends EntityMonster {
                          this.startRiding(entitychicken);
                      }
                  } else if ((double) this.world.random.nextFloat() < 0.05D) {
@@ -420,7 +420,7 @@ index 33b343c14..92ad1ad15 100644
                      entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                      entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 85d402965..0cca7b6d5 100644
+index 85d402965b..0cca7b6d51 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@@ -433,7 +433,7 @@ index 85d402965..0cca7b6d5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 86e5fbcda..fb96743af 100644
+index 86e5fbcdab..fb96743af2 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -446,7 +446,7 @@ index 86e5fbcda..fb96743af 100644
          entityvillager.u(this);
          entityvillager.setProfession(this.getProfession());
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index 576b3c565..4dd0e39ec 100644
+index 576b3c5650..4dd0e39ec3 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
 @@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@@ -459,7 +459,7 @@ index 576b3c565..4dd0e39ec 100644
  
                          entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 5ddf66eef..bb7e072ee 100644
+index 5ddf66eef5..bb7e072ee1 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@@ -472,7 +472,7 @@ index 5ddf66eef..bb7e072ee 100644
                                                  entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
                                                  groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index d4fdcbdfd..887e4461f 100644
+index d4fdcbdfd6..887e4461f3 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -494,7 +494,7 @@ index d4fdcbdfd..887e4461f 100644
          entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
          entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 0ac1fb53a..509d62f6b 100644
+index 0ac1fb53a4..509d62f6b6 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -134,7 +134,7 @@ public class VillageSiege {
@@ -507,7 +507,7 @@ index 0ac1fb53a..509d62f6b 100644
              } catch (Exception exception) {
                  exception.printStackTrace();
 diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
-index 94b21693e..0a223cfe5 100644
+index 94b21693e2..0a223cfe5a 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 @@ -270,7 +270,7 @@ public class WorldGenEndCityPieces {
@@ -520,7 +520,7 @@ index 94b21693e..0a223cfe5 100644
                  entityshulker.setPosition((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
                  entityshulker.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 2def56b06..abeb4aa02 100644
+index 2def56b067..abeb4aa025 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 @@ -154,8 +154,7 @@ public class WorldGenFeatureOceanRuinPieces {
@@ -534,7 +534,7 @@ index 2def56b06..abeb4aa02 100644
                  entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
-index 0e7aed09d..493a86e1b 100644
+index 0e7aed09d1..493a86e1bf 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 @@ -1800,7 +1800,7 @@ public class WorldGenMonumentPieces {
@@ -556,7 +556,7 @@ index 0e7aed09d..493a86e1b 100644
                  entityguardianelder.heal(entityguardianelder.getMaxHealth());
                  entityguardianelder.setPositionRotation((double) l + 0.5D, (double) i1, (double) j1 + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index 5fa2987d2..967e33b3d 100644
+index 5fa2987d2a..967e33b3d7 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 @@ -1640,7 +1640,7 @@ public class WorldGenVillagePieces {
@@ -578,7 +578,7 @@ index 5fa2987d2..967e33b3d 100644
                          entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                          entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index efb0379ce..3d8193c47 100644
+index efb0379ce3..3d8193c477 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 @@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@@ -591,7 +591,7 @@ index efb0379ce..3d8193c47 100644
                      entitywitch.di();
                      entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
-index 11010d8e1..4eb746ebb 100644
+index 11010d8e12..4eb746ebb0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 @@ -23,14 +23,14 @@ public class WorldGenWoodlandMansionPieces {
@@ -639,7 +639,7 @@ index 11010d8e1..4eb746ebb 100644
                  entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 078399aa0..4de45c439 100644
+index 8e23d060d0..6671d71802 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -494,7 +494,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -652,7 +652,7 @@ index 078399aa0..4de45c439 100644
                              entityhorseskeleton.s(true);
                              entityhorseskeleton.setAgeRaw(0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e33135ada..6ed7c9355 100644
+index e33135adaa..6ed7c93550 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1181,153 +1181,153 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0404-force-entity-dismount-during-teleportation.patch

@@ -1,4 +1,4 @@
-From d73bc3f6dd7a51b4eaa91d637551c77e4a21d8c2 Mon Sep 17 00:00:00 2001
+From 4b29a71b56032b53f2088e48fc9f50b86f212151 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9f9eaf25c..1e789de1b 100644
+index e448f08930..88298680fb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2094,12 +2094,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2110,12 +2110,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -41,7 +41,7 @@ index 9f9eaf25c..1e789de1b 100644
          }
  
      }
-@@ -2144,7 +2147,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2160,7 +2163,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return true; // CraftBukkit
      }
  
@@ -53,7 +53,7 @@ index 9f9eaf25c..1e789de1b 100644
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2154,7 +2160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2170,7 +2176,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) getBukkitEntity(),
@@ -62,7 +62,7 @@ index 9f9eaf25c..1e789de1b 100644
                  );
                  Bukkit.getPluginManager().callEvent(event);
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2165,7 +2171,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2181,7 +2187,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
@@ -72,7 +72,7 @@ index 9f9eaf25c..1e789de1b 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7d096efa2..2bd256b3e 100644
+index 82684dd688..dab958a042 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -991,8 +991,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -90,7 +90,7 @@ index 7d096efa2..2bd256b3e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 710ad8b17..4acbc17ae 100644
+index 710ad8b176..4acbc17aed 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2478,10 +2478,13 @@ public abstract class EntityLiving extends Entity {
@@ -110,7 +110,7 @@ index 710ad8b17..4acbc17ae 100644
              this.A(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 71c4ed8fa..1c90f2f85 100644
+index 71c4ed8fa6..1c90f2f85a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -778,10 +778,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0407-Add-more-Zombie-API.patch

@@ -1,14 +1,14 @@
-From 0dbdf509a59f03e4dafe9b932f2d09bd969a8a45 Mon Sep 17 00:00:00 2001
+From d90d25bc0160de90c5444cee72415fce8679a627 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 92ad1ad15..85465879d 100644
+index 81cc0c3b33..24bc3e0f08 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -22,8 +22,8 @@ public class EntityZombie extends EntityMonster {
+@@ -21,8 +21,8 @@ public class EntityZombie extends EntityMonster {
      private final AttributeModifier babyModifier = new AttributeModifier(EntityZombie.a, "Baby speed boost", world.paperConfig.babyZombieMovementSpeed, 1); // Paper - Remove static - Make baby speed configurable
      private static final DataWatcherObject<Boolean> bC = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Integer> bD = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
@@ -19,7 +19,7 @@ index 92ad1ad15..85465879d 100644
      private final PathfinderGoalBreakDoor bG;
      private boolean bH;
      private int bI;
-@@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
+@@ -30,6 +30,7 @@ public class EntityZombie extends EntityMonster {
      private float bK;
      private float bL;
      private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
@@ -27,7 +27,7 @@ index 92ad1ad15..85465879d 100644
  
      public EntityZombie(EntityTypes<?> entitytypes, World world) {
          super(entitytypes, world);
-@@ -79,14 +80,22 @@ public class EntityZombie extends EntityMonster {
+@@ -78,14 +79,22 @@ public class EntityZombie extends EntityMonster {
          this.getDataWatcher().register(EntityZombie.DROWN_CONVERTING, false);
      }
  
@@ -50,7 +50,7 @@ index 92ad1ad15..85465879d 100644
      public boolean dH() {
          return this.bH;
      }
-@@ -215,6 +224,13 @@ public class EntityZombie extends EntityMonster {
+@@ -207,6 +216,13 @@ public class EntityZombie extends EntityMonster {
          this.getDataWatcher().set(EntityZombie.DROWN_CONVERTING, true);
      }
  
@@ -64,7 +64,7 @@ index 92ad1ad15..85465879d 100644
      protected void dE() {
          this.a((EntityZombie) EntityTypes.DROWNED.create(world)); // Paper
          this.world.a((EntityHuman) null, 1040, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
-@@ -253,10 +269,17 @@ public class EntityZombie extends EntityMonster {
+@@ -245,10 +261,17 @@ public class EntityZombie extends EntityMonster {
          }
      }
  
@@ -83,7 +83,7 @@ index 92ad1ad15..85465879d 100644
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (super.damageEntity(damagesource, f)) {
              EntityLiving entityliving = this.getGoalTarget();
-@@ -369,6 +392,7 @@ public class EntityZombie extends EntityMonster {
+@@ -361,6 +384,7 @@ public class EntityZombie extends EntityMonster {
          nbttagcompound.setBoolean("CanBreakDoors", this.dH());
          nbttagcompound.setInt("InWaterTime", this.isInWater() ? this.bI : -1);
          nbttagcompound.setInt("DrownedConversionTime", this.isDrownConverting() ? this.drownedConversionTime : -1);
@@ -91,7 +91,7 @@ index 92ad1ad15..85465879d 100644
      }
  
      public void a(NBTTagCompound nbttagcompound) {
-@@ -382,7 +406,11 @@ public class EntityZombie extends EntityMonster {
+@@ -374,7 +398,11 @@ public class EntityZombie extends EntityMonster {
          if (nbttagcompound.hasKeyOfType("DrownedConversionTime", 99) && nbttagcompound.getInt("DrownedConversionTime") > -1) {
              this.startDrownedConversion(nbttagcompound.getInt("DrownedConversionTime"));
          }
@@ -105,7 +105,7 @@ index 92ad1ad15..85465879d 100644
  
      public void b(EntityLiving entityliving) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index e93ecb076..c516d3475 100644
+index e93ecb076b..c516d34759 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -77,4 +77,34 @@ public class CraftZombie extends CraftMonster implements Zombie {

work/Bukkit

@@ -1 +1 @@
-Subproject commit d4e8c8b3b3e87accede8a4d1765d601313ad3d9b
+Subproject commit 18cda9366dd97fc5e757254737786a81d9b69951

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 9dc56581e66ae04eb2acedc8fddc243223bc73bc
+Subproject commit 0c715b32b02a156fc72dadebe0d6ee1be7344f98