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:
da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
0cef14e4 Remove draft API from selectEntities

CraftBukkit Changes:
a46fdbc6 Remove outdated build delay.
3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material
9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission
c3749a23 Remove the Damage tag from items when it is 0.
f74c7b95 SPIGOT-4706: Can't interact with active item
494eef45 Mention requirement of JIRA ticket for bug fixes
51d62dec SPIGOT-4702: Exception when middle clicking certain slots
be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN

326 files changed, 1146 insertions, 1168 deletions

diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch
index 6e11ed7cf1..3cf62f1fce 100644
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 6437e32bc6fd55a9467e9edcdf4fc8d36b443f68 Mon Sep 17 00:00:00 2001
+From eb2e4ca41e4f961fedc2ff7a79ce3031e50d2d07 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3139,7 +3139,7 @@ index 00000000..5989ee21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 27988a66..cffa0c65 100644
+index a3c4b148..7e416f08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -602,7 +602,6 @@ public final class Bukkit {
@@ -3151,10 +3151,10 @@ index 27988a66..cffa0c65 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 12660040..9f7f760a 100644
+index 2767f4e5..5b5a3bc5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1278,6 +1278,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -1276,6 +1276,26 @@ public interface Server extends PluginMessageRecipient {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
  
diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
index d38322b0f3..44248b81ff 100644
--- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
@@ -1,14 +1,14 @@
-From b61d6612271e90b23b9ffeb9d5a16d9df184287a Mon Sep 17 00:00:00 2001
+From 484c707cb1f0be319fae942a8e5fe950a9cdb409 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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 2ad9a7d7f..3a80f2e29 100644
+index c1e2c13c..a887f3a4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1517,6 +1517,19 @@ public final class Bukkit {
+@@ -1515,6 +1515,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,7 +29,7 @@ index 2ad9a7d7f..3a80f2e29 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 3ad70b92f..4c3156071 100644
+index 609b818b..145f6df7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1132,6 +1132,15 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
index ac9ffc0e9d..5a14d7734e 100644
--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 9ffedfc9f2e8b401d42cf593c943f35d508d828e Mon Sep 17 00:00:00 2001
+From d75c0ea906215bfa452df39659f7055ae44b2139 Mon Sep 17 00:00:00 2001
 From: William <[email protected]>
 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 e27bdb7bf..d009aebd6 100644
+index 9b0cc417..03ba0b38 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1548,6 +1548,13 @@ public final class Bukkit {
+@@ -1546,6 +1546,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index e27bdb7bf..d009aebd6 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ab0438b81..e7e7dab8c 100644
+index ab2ff962..2a47c12d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1366,4 +1366,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1364,4 +1364,6 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Spigot spigot();
      // Spigot end
@@ -35,7 +35,7 @@ index ab0438b81..e7e7dab8c 100644
 +    void reloadPermissions(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index 1104c6037..ba118dbfe 100644
+index 1104c603..ba118dbf 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -14,15 +14,35 @@ public class ReloadCommand extends BukkitCommand {
@@ -85,7 +85,7 @@ index 1104c6037..ba118dbfe 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 4c55f5f8c..12e17709c 100644
+index 4c55f5f8..12e17709 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -777,4 +777,13 @@ public final class SimplePluginManager implements PluginManager {
diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
index 45aef62e57..6a437ffb3b 100644
--- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From ad0c8ca9e48518bfdc7f2d0b624298e45ab22aae Mon Sep 17 00:00:00 2001
+From c1756d0416f0a65ab568975369fccfbbf04118d1 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 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 d009aebd6..8e0cbbf15 100644
+index 03ba0b38..08570c13 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1555,6 +1555,15 @@ public final class Bukkit {
+@@ -1553,6 +1553,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index d009aebd6..8e0cbbf15 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e7e7dab8c..8f61619a3 100644
+index 2a47c12d..fc8887d1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1368,4 +1368,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1366,4 +1366,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper
@@ -37,7 +37,7 @@ index e7e7dab8c..8f61619a3 100644
 +    boolean reloadCommandAliases(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index bd2c7a696..864c263bb 100644
+index bd2c7a69..864c263b 100644
 --- a/src/main/java/org/bukkit/command/CommandMap.java
 +++ b/src/main/java/org/bukkit/command/CommandMap.java
 @@ -128,4 +128,14 @@ public interface CommandMap {
@@ -56,7 +56,7 @@ index bd2c7a696..864c263bb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index f52d91d19..d7ca4fa3f 100644
+index 682d27f9..b78f3d69 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -285,4 +285,11 @@ public class SimpleCommandMap implements CommandMap {
@@ -72,7 +72,7 @@ index f52d91d19..d7ca4fa3f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index ba118dbfe..607323a83 100644
+index ba118dbf..607323a8 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -14,7 +14,7 @@ public class ReloadCommand extends BukkitCommand {
diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
index 9a5eeb3747..05a550b73a 100644
--- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From c74ed751192df73e8d8ee4ccc6c8cec0d44a2116 Mon Sep 17 00:00:00 2001
+From c257016dfd957d957c31920232cd6ba10a5db45e Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 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 8e0cbbf15..90b41fd25 100644
+index 08570c13..92bc8eb6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1564,6 +1564,16 @@ public final class Bukkit {
+@@ -1562,6 +1562,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 8e0cbbf15..90b41fd25 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8f61619a3..fe3144c00 100644
+index fc8887d1..9fa704e3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1370,4 +1370,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1368,4 +1368,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
@@ -46,7 +46,7 @@ index 8f61619a3..fe3144c00 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 92c23424e..e420b7902 100644
+index 92c23424..e420b790 100644
 --- a/src/main/java/org/bukkit/command/PluginCommand.java
 +++ b/src/main/java/org/bukkit/command/PluginCommand.java
 @@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
index 25f6b3f1af..0786ec966c 100644
--- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From cccc14b25c7e3a218b057172eb111bcb5b89ca27 Mon Sep 17 00:00:00 2001
+From 7def00d86d228835b95d99b7526e25e62064723a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 000000000..476151d2a
+index 00000000..476151d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 @@ -0,0 +1,145 @@
@@ -158,7 +158,7 @@ index 000000000..476151d2a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
-index 000000000..7b3b6ef53
+index 00000000..7b3b6ef5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 @@ -0,0 +1,72 @@
@@ -235,10 +235,10 @@ index 000000000..7b3b6ef53
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 90b41fd25..16fa78b86 100644
+index 92bc8eb6..7c97b11b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1574,6 +1574,40 @@ public final class Bukkit {
+@@ -1572,6 +1572,40 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -280,10 +280,10 @@ index 90b41fd25..16fa78b86 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fe3144c00..edbfa3fdc 100644
+index 9fa704e3..bf75e6a2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1379,5 +1379,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1377,5 +1377,33 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
index 8d94328b21..0305019508 100644
--- a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
@@ -1,14 +1,14 @@
-From b15f7b990de34ce684599ca6515f879f1a2545b3 Mon Sep 17 00:00:00 2001
+From 383fa5f406c81e4d9fe447e96ab1f31f484762c8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 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 19fb0e5d..6b0a0906 100644
+index fab360c0..3b3d2712 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1589,6 +1589,15 @@ public final class Bukkit {
+@@ -1587,6 +1587,15 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -25,10 +25,10 @@ index 19fb0e5d..6b0a0906 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 1df58f72..66d22ba7 100644
+index ce2644fe..66e53c51 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1392,6 +1392,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1390,6 +1390,13 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
@@ -56,5 +56,5 @@ index c2c19ed4..f0222fc2 100644
              for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
                  target.sendMessage(line);
 -- 
-2.17.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index b10d976ee8..e0dc1d7c5b 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,11 +1,11 @@
-From 15820719793e4d4aee4726cfde7d15541dfc4764 Mon Sep 17 00:00:00 2001
+From acf9c715648075076c1438814a611103748ec3a0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
 
 
 diff --git a/src/main/java/net/minecraft/server/AttributeInstance.java b/src/main/java/net/minecraft/server/AttributeInstance.java
-index be179ba21..c53bc8230 100644
+index be179ba213..c53bc8230a 100644
 --- a/src/main/java/net/minecraft/server/AttributeInstance.java
 +++ b/src/main/java/net/minecraft/server/AttributeInstance.java
 @@ -21,8 +21,10 @@ public interface AttributeInstance {
@@ -20,7 +20,7 @@ index be179ba21..c53bc8230 100644
  
      void b(UUID uuid);
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 13dc7abc5..9bb7c9c65 100644
+index 13dc7abc50..9bb7c9c652 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -45,6 +45,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -56,7 +56,7 @@ index 13dc7abc5..9bb7c9c65 100644
              return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1ff78eed4..417c015e5 100644
+index 1ff78eed40..417c015e56 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent;
@@ -77,7 +77,7 @@ index 1ff78eed4..417c015e5 100644
      public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index 34586bca6..b0c004b1f 100644
+index 34586bca65..b0c004b1f2 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -24,6 +24,8 @@ public class ChunkCoordIntPair {
@@ -90,7 +90,7 @@ index 34586bca6..b0c004b1f 100644
          return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index cc9604749..70a95c263 100644
+index cc9604749b..70a95c2636 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -13,7 +13,7 @@ import org.apache.logging.log4j.Logger;
@@ -103,7 +103,7 @@ index cc9604749..70a95c263 100644
      private final IChunkLoader e;
      private final IAsyncTaskHandler f;
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index d24ec3d53..9e83610f1 100644
+index d24ec3d53c..9e83610f1a 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -60,6 +60,7 @@ public class DataBits {
@@ -115,7 +115,7 @@ index d24ec3d53..9e83610f1 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java
-index dae40b9cd..2ee879196 100644
+index dae40b9cde..2ee8791963 100644
 --- a/src/main/java/net/minecraft/server/DataPalette.java
 +++ b/src/main/java/net/minecraft/server/DataPalette.java
 @@ -4,8 +4,10 @@ import javax.annotation.Nullable;
@@ -130,7 +130,7 @@ index dae40b9cd..2ee879196 100644
      T a(int i);
  
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 59cbbdcb3..6fcfc5ef7 100644
+index 59cbbdcb3d..6fcfc5ef72 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -8,7 +8,7 @@ import java.util.stream.Collectors;
@@ -172,7 +172,7 @@ index 59cbbdcb3..6fcfc5ef7 100644
          this.b();
          packetdataserializer.writeByte(this.i);
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 372afbe94..20b7c2c6d 100644
+index 372afbe94e..20b7c2c6dc 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -6,6 +6,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -184,7 +184,7 @@ index 372afbe94..20b7c2c6d 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 8b2000f68..1a3517aee 100644
+index 8b2000f683..1a3517aeed 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -125,6 +125,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -196,7 +196,7 @@ index 8b2000f68..1a3517aee 100644
          // CraftBukkit start - fire event
          setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d4fe0ab6b..011c7af21 100644
+index d4fe0ab6bf..011c7af218 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -208,7 +208,7 @@ index d4fe0ab6b..011c7af21 100644
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 5f9255df1..5ea517043 100644
+index 5f9255df14..5ea5170436 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -2,11 +2,13 @@ package net.minecraft.server;
@@ -226,7 +226,7 @@ index 5f9255df1..5ea517043 100644
          return SoundCategory.HOSTILE;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index b8abd6363..a07ee150c 100644
+index b8abd6363f..a07ee150c2 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -277,7 +277,7 @@ index b8abd6363..a07ee150c 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 132fe8e88..1fe7c0b01 100644
+index 9e763b6e39..a7fc148591 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -36,10 +36,19 @@ import org.bukkit.event.world.StructureGrowEvent;
@@ -301,7 +301,7 @@ index 132fe8e88..1fe7c0b01 100644
      @Deprecated
      private Item item;
      private NBTTagCompound tag;
-@@ -584,6 +593,17 @@ public final class ItemStack {
+@@ -590,6 +599,17 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList();
      }
  
@@ -319,7 +319,7 @@ index 132fe8e88..1fe7c0b01 100644
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
      }
-@@ -668,6 +688,7 @@ public final class ItemStack {
+@@ -674,6 +694,7 @@ public final class ItemStack {
          return this.tag != null && this.tag.hasKeyOfType("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
      }
  
@@ -327,7 +327,7 @@ index 132fe8e88..1fe7c0b01 100644
      public void a(String s, NBTBase nbtbase) {
          this.getOrCreateTag().set(s, nbtbase);
      }
-@@ -743,6 +764,7 @@ public final class ItemStack {
+@@ -747,6 +768,7 @@ public final class ItemStack {
      // CraftBukkit start
      @Deprecated
      public void setItem(Item item) {
@@ -337,7 +337,7 @@ index 132fe8e88..1fe7c0b01 100644
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 000000000..c97e116aa
+index 0000000000..c97e116aaf
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +1,316 @@
@@ -658,7 +658,7 @@ index 000000000..c97e116aa
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 434471215..8c5d6c1d3 100644
+index 434471215d..8c5d6c1d38 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -23,7 +23,7 @@ public class NBTTagCompound implements NBTBase {
@@ -685,7 +685,7 @@ index 434471215..8c5d6c1d3 100644
      public UUID a(String s) {
          return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d85bc522c..e2fc41d6d 100644
+index d85bc522c3..e2fc41d6d1 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -43,7 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -726,7 +726,7 @@ index d85bc522c..e2fc41d6d 100644
          public QueuedPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
              this.a = packet;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 7582151ae..d05f1e02c 100644
+index 7582151ae4..d05f1e02cf 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -738,7 +738,7 @@ index 7582151ae..d05f1e02c 100644
          for (int j = 1; j < 5; ++j) {
              if ((i & -1 << j * 7) == 0) {
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index d54177bdc..2aa805eef 100644
+index d54177bdcc..2aa805eef1 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -42,6 +42,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -750,7 +750,7 @@ index d54177bdc..2aa805eef 100644
                          throw new SkipEncodeException(throwable);
                      } else {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 395215bbd..f2159bc2d 100644
+index 395215bbdd..f2159bc2dd 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -13,7 +13,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -771,7 +771,7 @@ index 395215bbd..f2159bc2d 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 330e74bb9..d97cc4f72 100644
+index aac5f9bfa9..06f90ceca5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -788,7 +788,7 @@ index 330e74bb9..d97cc4f72 100644
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
 diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
-index 997fdc499..988a36119 100644
+index 997fdc4997..988a361195 100644
 --- a/src/main/java/net/minecraft/server/PlayerInventory.java
 +++ b/src/main/java/net/minecraft/server/PlayerInventory.java
 @@ -20,7 +20,7 @@ public class PlayerInventory implements IInventory {
@@ -801,7 +801,7 @@ index 997fdc499..988a36119 100644
      public EntityHuman player;
      private ItemStack carried;
 diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java
-index 6740b396a..ea08c5a1c 100644
+index 6740b396a1..ea08c5a1c8 100644
 --- a/src/main/java/net/minecraft/server/PotionUtil.java
 +++ b/src/main/java/net/minecraft/server/PotionUtil.java
 @@ -110,6 +110,7 @@ public class PotionUtil {
@@ -813,7 +813,7 @@ index 6740b396a..ea08c5a1c 100644
          MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry);
  
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index a894f7886..93935e7c7 100644
+index a894f7886d..93935e7c77 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -56,6 +56,7 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -825,7 +825,7 @@ index a894f7886..93935e7c7 100644
          return this.b.size();
      }
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 8cb97b894..5e71d2ac2 100644
+index 8cb97b894a..5e71d2ac27 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -35,8 +35,8 @@ public class SystemUtils {
@@ -878,7 +878,7 @@ index 8cb97b894..5e71d2ac2 100644
  
      static enum IdentityHashingStrategy implements Strategy<Object> {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 2ef4ac64b..f907d4f3b 100644
+index 2ef4ac64b2..f907d4f3b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -94,6 +94,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index db12f61335..5b69c2e7b7 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From cc3ec2a98907b7604edc114dffd2c31097000221 Mon Sep 17 00:00:00 2001
+From 4a1323b0eed07d0157b70eb57455075f172446c7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..7a2a27cdb
+index 0000000000..7a2a27cdb4
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 000000000..7a2a27cdb
 +}
 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 5518ec1e5..7691409f6 100644
+index 5518ec1e54..7691409f6c 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 5518ec1e5..7691409f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e89ba3e41..1dc13fcc3 100644
+index e89ba3e412..1dc13fcc30 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 e89ba3e41..1dc13fcc3 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 554fbeb07..2b1198ca8 100644
+index 554fbeb071..2b1198ca8f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -853,6 +853,7 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index 554fbeb07..2b1198ca8 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 bdb4ca764..131946154 100644
+index bdb4ca7643..131946154e 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;
@@ -577,7 +577,7 @@ index bdb4ca764..131946154 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 011c7af21..b092b0fa2 100644
+index 011c7af218..b092b0fa23 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 011c7af21..b092b0fa2 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 d97cc4f72..1c90c9d7a 100644
+index 06f90ceca5..b9e6a3275c 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;
@@ -956,7 +956,7 @@ index d97cc4f72..1c90c9d7a 100644
  
      }
  
-@@ -1601,7 +1600,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1602,7 +1601,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -965,7 +965,7 @@ index d97cc4f72..1c90c9d7a 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1612,7 +1611,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1613,7 +1612,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -974,7 +974,7 @@ index d97cc4f72..1c90c9d7a 100644
              return;
          }
  
-@@ -1625,7 +1624,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1626,7 +1625,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -984,7 +984,7 @@ index d97cc4f72..1c90c9d7a 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 a73947d26..596aa27fe 100644
+index a73947d261..596aa27feb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,12 +1,19 @@
@@ -1008,7 +1008,7 @@ index a73947d26..596aa27fe 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 @@
@@ -1032,7 +1032,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> {
@@ -1086,7 +1086,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;
@@ -1106,7 +1106,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 9d5b3958b..ad792af2b 100644
+index 9d5b3958bf..ad792af2bc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1214,7 +1214,7 @@ index 9d5b3958b..ad792af2b 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 @@
@@ -1316,7 +1316,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 6a44f0d91..fea49800d 100644
+index 6a44f0d918..fea49800d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1986,12 +1986,31 @@ public final class CraftServer implements Server {
@@ -1353,7 +1353,7 @@ index 6a44f0d91..fea49800d 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 @@
@@ -1531,7 +1531,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 @@
@@ -1567,7 +1567,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 7f0465ec4..99f99148d 100644
+index 7f0465ec43..99f99148d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1700,6 +1700,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1586,7 +1586,7 @@ index 7f0465ec4..99f99148d 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;
@@ -1653,7 +1653,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..0d9a46680 100644
+index 3f55381c15..0d9a466809 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,9 +1,11 @@
@@ -1738,7 +1738,7 @@ index 3f55381c1..0d9a46680 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;
@@ -1750,7 +1750,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;
diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index 7f065ed0d6..4e02f9052a 100644
--- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 50c27b3dd87070cac07f40031b0178ab9a3d7b79 Mon Sep 17 00:00:00 2001
+From afe18ef667aa63c426197f85c3785aa7e2e36e46 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1c90c9d7a..b57f48035 100644
+index b9e6a3275c..9a83e5fc0b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1532,6 +1532,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1533,6 +1533,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index 1c90c9d7a..b57f48035 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 76fb12630..4a53095a1 100644
+index 7b4af7a904..c6e6ae4fe7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -701,6 +701,29 @@ public final class CraftServer implements Server {
@@ -82,7 +82,7 @@ index 76fb12630..4a53095a1 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index a0cdd2317..984df4083 100644
+index a0cdd2317c..984df4083d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -14,6 +14,7 @@ public class ServerShutdownThread extends Thread {
@@ -94,7 +94,7 @@ index a0cdd2317..984df4083 100644
          } catch (ExceptionWorldConflict ex) {
              ex.printStackTrace();
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 4b3aa85c9..e44c23016 100644
+index 4b3aa85c97..e44c230165 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -6,6 +6,7 @@ public class AsyncCatcher
@@ -106,7 +106,7 @@ index 4b3aa85c9..e44c23016 100644
      public static void catchOp(String reason)
      {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index f4e088c13..944151d14 100644
+index f4e088c134..944151d140 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -43,6 +43,7 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index 45667f8a9e..bb12034984 100644
--- a/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 2e1c82ecd4f7f25aeba48a3070d804a3de739dc7 Mon Sep 17 00:00:00 2001
+From ced6f93ab463262802669d48ad20f64237f9cf3e Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b57f48035..f944eff87 100644
+index 9a83e5fc0b..8a403354d9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1301,7 +1301,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1302,7 +1302,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -22,7 +22,7 @@ index b57f48035..f944eff87 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 237210cc8..5b9f2dd4a 100644
+index 237210cc89..5b9f2dd4a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -126,6 +126,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch
index 02aabb8e41..72eabf7816 100644
--- a/Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From e9ff7c6aaa5bb9f3dc8adf8bac2f09b89b0de4ed Mon Sep 17 00:00:00 2001
+From 08653afb00866b63ce45e73d12eac4be100fe9f9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 1fe7c0b01..e0f782acc 100644
+index a7fc148591..37d37f1f64 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;
@@ -61,7 +61,7 @@ index 1fe7c0b01..e0f782acc 100644
              this.getItem().a(this.tag);
              // CraftBukkit end
          }
-@@ -606,6 +625,7 @@ public final class ItemStack {
+@@ -612,6 +631,7 @@ public final class ItemStack {
      // Paper end
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
@@ -69,7 +69,7 @@ index 1fe7c0b01..e0f782acc 100644
      }
  
      public IChatBaseComponent getName() {
-@@ -682,6 +702,7 @@ public final class ItemStack {
+@@ -688,6 +708,7 @@ public final class ItemStack {
          nbttagcompound.setString("id", String.valueOf(IRegistry.ENCHANTMENT.getKey(enchantment)));
          nbttagcompound.setShort("lvl", (short) ((byte) i));
          nbttaglist.add((NBTBase) nbttagcompound);
@@ -78,7 +78,7 @@ index 1fe7c0b01..e0f782acc 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 f907d4f3b..eeb2c5689 100644
+index f907d4f3b7..eeb2c5689e 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 f907d4f3b..eeb2c5689 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 ef6437f38..2508cfcfa 100644
+index ef6437f380..2508cfcfa2 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;
diff --git a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
index 9a36155572..9869a5c735 100644
--- a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From b90ee7c51e4b323e8c206bf7006f36484f8cfa9c Mon Sep 17 00:00:00 2001
+From c926ab31b1ebc9dc51496f8a9dcbe76eeff63dce Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index 77440ac81..8711462e1 100644
+index 77440ac81f..8711462e16 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,10 +18,10 @@ index 77440ac81..8711462e1 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f944eff87..72c06cdb8 100644
+index 8a403354d9..545899fc29 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1873,6 +1873,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1874,6 +1874,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 7cb12d27bf..8d85179555 100644
--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 37a67d8562ace9e45671aa956335bb24ee186c5d Mon Sep 17 00:00:00 2001
+From 261781b7a4ce6899433dca3cbf14ceecf88ff6d6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 260c55016..37cc057ab 100644
+index 260c55016e..37cc057ab7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -264,4 +264,9 @@ public class PaperWorldConfig {
@@ -26,10 +26,10 @@ index 260c55016..37cc057ab 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 72c06cdb8..5516726e8 100644
+index 545899fc29..66aa3bde64 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1610,7 +1610,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1611,7 +1611,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -48,7 +48,7 @@ index 72c06cdb8..5516726e8 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6e62ea90d..523694899 100644
+index 6e62ea90dd..5236948990 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -176,7 +176,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0132-Configurable-packet-in-spam-threshold.patch
index d42247aa85..8ee9ed2b0c 100644
--- a/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0132-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 02153bf4f222c0a94526c55cd3758ef401fd38ee Mon Sep 17 00:00:00 2001
+From b347ba0ec3484271a1a45b3c628032e2ebfb5410 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 894501c61..dfb931298 100644
+index b7b28591e4..6562cf54b7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -253,4 +253,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 894501c61..dfb931298 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 041e4608e..f5624f3d6 100644
+index 73907b4f0e..b29a1f340f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1177,13 +1177,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
deleted file mode 100644
index 9908d54500..0000000000
--- a/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3d5681205a2678f4417f1e02f12b4da9f96ff5c7 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <[email protected]>
-Date: Sun, 4 Sep 2016 16:35:43 -0500
-Subject: [PATCH] Fix AIOOBE in inventory handling
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8b515b722..041e4608e 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2066,7 +2066,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                     case CLONE:
-                         if (packetplayinwindowclick.d() == 2) {
-                             click = ClickType.MIDDLE;
--                            if (packetplayinwindowclick.c() == -999) {
-+                            if (packetplayinwindowclick.c() < 0) { // Paper - GH-404
-                                 action = InventoryAction.NOTHING;
-                             } else {
-                                 Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
--- 
-2.21.0
-
diff --git a/Spigot-Server-Patches/0134-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0133-Configurable-flying-kick-messages.patch
index 9cfc9a80da..fbf57e8748 100644
--- a/Spigot-Server-Patches/0134-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0133-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 8f02577907e387752249570e682b65e4e7a8f146 Mon Sep 17 00:00:00 2001
+From 5e25d2de180bcf44040d6b17e0b15109bf3fb194 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f5bd2245a..51b0dd972 100644
+index 6562cf54b7..fb7ada8139 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -262,4 +262,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index f5bd2245a..51b0dd972 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c31f84a84..f2686f7cb 100644
+index b29a1f340f..4a06527b6f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -43,5 +43,5 @@ index c31f84a84..f2686f7cb 100644
                  }
              } else {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0134-Auto-Save-Improvements.patch
index 5edde3a1b2..a74b65fcb6 100644
--- a/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0134-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 1c1f11c91cfa610479809bda5f00f4d6c5dc25bf Mon Sep 17 00:00:00 2001
+From e82072ef380eb0d17fb93cee8bf8275fb11f29de Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fb7ada813..17b4e01aa 100644
+index fb7ada8139..17b4e01aa4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -269,4 +269,15 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index fb7ada813..17b4e01aa 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c70771614..6e28410c3 100644
+index c70771614d..6e28410c37 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -64,7 +64,7 @@ index c70771614..6e28410c3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ddccdc939..0d70ce797 100644
+index bdf922db50..0bf614ce57 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -53,9 +53,9 @@ public class Chunk implements IChunkAccess {
@@ -96,7 +96,7 @@ index ddccdc939..0d70ce797 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index d0bf0f72d..fbc69b5ba 100644
+index d0bf0f72da..fbc69b5ba5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -243,7 +243,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -109,7 +109,7 @@ index d0bf0f72d..fbc69b5ba 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 621e79bc5..260fa3e67 100644
+index 621e79bc53..260fa3e678 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -34,6 +34,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -121,7 +121,7 @@ index 621e79bc5..260fa3e67 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ffb06141..6283c774d 100644
+index 7ffb061414..6283c774d6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -143,6 +143,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -168,7 +168,7 @@ index 7ffb06141..6283c774d 100644
          this.methodProfiler.enter("snooper");
          if (getSnooperEnabled() && !this.snooper.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 79641a73a..fe6649224 100644
+index 79641a73a8..fe6649224a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -341,6 +341,7 @@ public abstract class PlayerList {
@@ -207,7 +207,7 @@ index 79641a73a..fe6649224 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 639068d2d..49c5b0b5c 100644
+index 639068d2dc..49c5b0b5cc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -855,8 +855,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0136-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0135-Chunk-registration-fixes.patch
index 92086334d2..2fc6ba3cca 100644
--- a/Spigot-Server-Patches/0136-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0135-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From fbb663799bcceee4cfcafbac14a6b78fb196a209 Mon Sep 17 00:00:00 2001
+From 3b58205c29904e995b9ea750ec5d41de9427897b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
diff --git a/Spigot-Server-Patches/0137-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0136-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 8542e49356..e7d623b189 100644
--- a/Spigot-Server-Patches/0137-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0136-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 0b96cb96112fa10a994a9881fd30e01f61622d1b Mon Sep 17 00:00:00 2001
+From 7e64d04da6a50ad54160001dd38f093058c925ff Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
@@ -25,5 +25,5 @@ index 8392b16b3b..752b56435d 100644
 +    
  }
 -- 
-2.19.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0137-Auto-fix-bad-Y-levels-on-player-login.patch
index 6057ff84b5..6c1b886039 100644
--- a/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0137-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 2f90affa66b1be92982860f5247fa14253b7b29d Mon Sep 17 00:00:00 2001
+From 656019b7f95b56cca236de20cb9940e6f438769a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 97714be6d..742385ad1 100644
+index 260fa3e678..fcb5f590df 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -187,6 +187,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index 97714be6d..742385ad1 100644
              if (this.bK().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.bK().getGamemode());
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0139-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0138-Disable-Vanilla-Chunk-GC.patch
index b8ef0f0528..9b787d98de 100644
--- a/Spigot-Server-Patches/0139-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0138-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 92acd3d67e0f18d63ba3530d82b25028307c0b8c Mon Sep 17 00:00:00 2001
+From ee210a06121210a6975b810dbbbe28f8f98944d7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -28,5 +28,5 @@ index 49c5b0b5cc..15736f7575 100644
          }
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0139-Option-to-remove-corrupt-tile-entities.patch
index 677108432a..3fa8477aa1 100644
--- a/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0139-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 1babe552fc78799271b2ff008b63fe881ff40666 Mon Sep 17 00:00:00 2001
+From 6a37f4af427998aa81105d6a80cca73b74427ee7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
diff --git a/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0140-Add-EntityZapEvent.patch
index 88e75a25a1..f203862c5b 100644
--- a/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0140-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From f156aa78cff3ffb08f6f18e039295fc4bb88b64e Mon Sep 17 00:00:00 2001
+From b179aa6184990023731937ba9669775897cae5a5 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -39,7 +39,7 @@ index f8e05b75de..213d0b18c9 100644
              entitywitch.prepare(this.world.getDamageScaler(new BlockPosition(entitywitch)), (GroupDataEntity) null, (NBTTagCompound) null);
              entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b1df5985ef..ad83c69d76 100644
+index 4d2fdfe286..fa0eb2ebeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -875,6 +875,14 @@ public class CraftEventFactory {
@@ -58,5 +58,5 @@ index b1df5985ef..ad83c69d76 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0142-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index e7e8336735..bec415521b 100644
--- a/Spigot-Server-Patches/0142-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0141-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 4841e8ebb7cc1d174aff030bc4c1b5fe2692e1a0 Mon Sep 17 00:00:00 2001
+From 12c6e1557233d240f7f5ef44e6b5dcd93c19c097 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index e94786138..c61721bc3 100644
+index e94786138e..c61721bc3d 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -193,7 +193,12 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC
@@ -31,5 +31,5 @@ index e94786138..c61721bc3 100644
                  if (iblockdata1.getBlock() == this) {
                      BlockPropertyChestType blockpropertychesttype1 = (BlockPropertyChestType) iblockdata1.get(BlockChest.b);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0142-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index f29cf4455c..359e6e63d6 100644
--- a/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0142-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From c6aae818d76a353a6ad830f8970370d2f0661085 Mon Sep 17 00:00:00 2001
+From 266fe023d1d38728ba461724a7f2a23a2ee07cfd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,7 +7,7 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7e847af00..9829b3b64 100644
+index 7e847af00b..9829b3b64b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -341,6 +341,11 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index 7e847af00..9829b3b64 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fbc69b5ba..9b5908a5b 100644
+index fbc69b5ba5..9b5908a5b4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -236,6 +236,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -41,7 +41,7 @@ index fbc69b5ba..9b5908a5b 100644
                  Chunk chunk = (Chunk) objectiterator.next();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a144118f6..adfb5d056 100644
+index a144118f66..adfb5d056f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -156,6 +156,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0144-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0143-Chunk-Save-Stats-Debug-Option.patch
index 9d80d9cc1e..ea8f050588 100644
--- a/Spigot-Server-Patches/0144-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0143-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From fa2b0c5fa02d4b14d6efaed6d377ba7366964ca8 Mon Sep 17 00:00:00 2001
+From 8efbb3a0533a16d6c9e3ac27e41cd03bba1e35d8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9b5908a5b..299776728 100644
+index 9b5908a5b4..2997767282 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -54,7 +54,7 @@ index 9b5908a5b..299776728 100644
                  return false;
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index adfb5d056..0fc4d9f52 100644
+index adfb5d056f..0fc4d9f520 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -156,7 +156,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -89,5 +89,5 @@ index adfb5d056..0fc4d9f52 100644
              if (nbttagcompound == null) {
                  return true;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0144-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 4ace76a08e..5f4cc445ef 100644
--- a/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0144-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From cb5197c80105b6f86294986d21c162f9e23a39cf Mon Sep 17 00:00:00 2001
+From 2c4fa5b98bf65f05b2aa3bfbd8fc3582f4d1b441 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9829b3b64..104a3acf3 100644
+index 9829b3b64b..104a3acf31 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index 9829b3b64..104a3acf3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 489dd861d..3eaee8d89 100644
+index 489dd861d2..3eaee8d890 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {
diff --git a/Spigot-Server-Patches/0146-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0145-Cache-user-authenticator-threads.patch
index 66ef0d84f0..10c8d9a5e2 100644
--- a/Spigot-Server-Patches/0146-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0145-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From 9f6dd6a0697949d220cb8ebe4d3b7f1c7a3aec94 Mon Sep 17 00:00:00 2001
+From 4432738f08d935dd5677b7ea6fe78be700ee1c95 Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 0f6ac493f..e901c066a 100644
+index 0f6ac493f6..e901c066ac 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -92,6 +92,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -66,5 +66,5 @@ index 0f6ac493f..e901c066a 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0147-Optimise-removeQueue.patch b/Spigot-Server-Patches/0146-Optimise-removeQueue.patch
index 64ab07495f..43d93ed255 100644
--- a/Spigot-Server-Patches/0147-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0146-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From f89c7debb7c660439d856aca963f8056cf86404f Mon Sep 17 00:00:00 2001
+From 12d9e3e33da074a495df49f3e4c97181f69b4bce Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fcb5f590d..6b9bbc77c 100644
+index fcb5f590df..6b9bbc77c0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
diff --git a/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0147-Allow-Reloading-of-Command-Aliases.patch
index 719ba584c1..575eee59e0 100644
--- a/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0147-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 9fd607da2863237879996ac81926fc5cf51923b1 Mon Sep 17 00:00:00 2001
+From 43cf6218919f25f7750453574512b30ba1c579a0 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c26da0984..bb7792ce2 100644
+index c26da09849..bb7792ce2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2122,5 +2122,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0148-Add-source-to-PlayerExpChangeEvent.patch
index c283c21db1..eed356fdd7 100644
--- a/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0148-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 0f02d1e6cca532db18c2748b4eb53cccbb554a9f Mon Sep 17 00:00:00 2001
+From 276826e62696d8d63e0f05d41ea8613873b04dfd Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -18,7 +18,7 @@ index 808d1a120a..3030dd9c31 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ad83c69d76..cf215205be 100644
+index fa0eb2ebeb..3785d4f096 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -52,6 +52,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index ad83c69d76..cf215205be 100644
          return handleBlockGrowEvent(world, pos, block, 3);
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0150-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0149-Optimize-World.isLoaded-BlockPosition-Z.patch
index ab8a0e3f9e..3f342b7e96 100644
--- a/Spigot-Server-Patches/0150-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0149-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 0033ccc91201ea518109c020dd1102531147941e Mon Sep 17 00:00:00 2001
+From ee914b4b6a1aa8140e7f599cfab6dfe1bc78e995 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4eb8e25bf..d4ed23089 100644
+index 282d6ae84c..5e1ab431dc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -268,6 +268,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -21,5 +21,5 @@ index 4eb8e25bf..d4ed23089 100644
      public boolean isLoadedAndInBounds(BlockPosition blockposition) {
          return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0151-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch
index f8e594061b..0650b7eabc 100644
--- a/Spigot-Server-Patches/0151-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0150-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From c4ef329f02b98ce1b15206721f1cf268bfcfd05a Mon Sep 17 00:00:00 2001
+From 5b2757104d7ef336e2b64ced2a0d0662eae91cc6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0004c134a..40704664b 100644
+index 113264981e..b6ed9082fd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 0004c134a..40704664b 100644
      public DimensionManager dimension;
      protected BlockPosition aq;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index aa8a14b39..16aa2b5f2 100644
+index 118b974d76..861fc6fd5c 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -190,6 +190,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index aa8a14b39..16aa2b5f2 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0151-Add-ProjectileCollideEvent.patch
index 40f74c4fdc..2b1fa19da3 100644
--- a/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0151-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 35850901291462e598576298d4b4912569c0ffd3 Mon Sep 17 00:00:00 2001
+From 4628e67615e80fef7ba4ee589dcf418b16014a6e Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -46,7 +46,7 @@ index 3e3619d79f..58cc4824cf 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 16aa2b5f25..23f7d36b55 100644
+index 861fc6fd5c..202b8d2158 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 {
@@ -87,7 +87,7 @@ index 751ea456b9..bab5b89fe9 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 cf215205be..fb0fe35000 100644
+index 3785d4f096..9cbbfed4fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -979,6 +979,16 @@ public class CraftEventFactory {
@@ -108,5 +108,5 @@ index cf215205be..fb0fe35000 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0152-Prevent-Pathfinding-out-of-World-Border.patch
index 5b1f81b213..1777f1c5a5 100644
--- a/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0152-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 303db4ec97a30becab6cf491f99cb91bce5bf752 Mon Sep 17 00:00:00 2001
+From 2ffd8e341776fa64537f3474cdd35f18ee5ca681 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 716d00afb..c55aadb53 100644
+index 716d00afb1..c55aadb536 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -75,6 +75,7 @@ public abstract class NavigationAbstract {
@@ -27,7 +27,7 @@ index 716d00afb..c55aadb53 100644
                  return this.c;
              } else {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index beac8ac0b..86ada40a1 100644
+index beac8ac0b9..86ada40a10 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -19,7 +19,7 @@ public class WorldBorder {
@@ -40,5 +40,5 @@ index beac8ac0b..86ada40a1 100644
      }
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0154-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0153-Bound-Treasure-Maps-to-World-Border.patch
index 50f0c01ea9..d1d3e78fd9 100644
--- a/Spigot-Server-Patches/0154-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0153-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From e9d285fd56df3f5056781c229ac47d15b1848268 Mon Sep 17 00:00:00 2001
+From 1d5387e7ec06f4e21d06d383cc57a3f957b3d1c0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 7194c048c..2ea5ac316 100644
+index 7194c048c9..2ea5ac3161 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -122,6 +122,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 7194c048c..2ea5ac316 100644
  
                                  if (structurestart != StructureGenerator.a) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 86ada40a1..a2e856952 100644
+index 86ada40a10..a2e856952e 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -23,6 +23,18 @@ public class WorldBorder {
@@ -46,5 +46,5 @@ index 86ada40a1..a2e856952 100644
          return (double) chunkcoordintpair.f() > this.b() && (double) chunkcoordintpair.d() < this.d() && (double) chunkcoordintpair.g() > this.c() && (double) chunkcoordintpair.e() < this.e();
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0154-Configurable-Cartographer-Treasure-Maps.patch
index bbba6497b3..963b865544 100644
--- a/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0154-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 607f9a373a20595be543b567b39a2c7a4e634f13 Mon Sep 17 00:00:00 2001
+From 924ca775f5c4e2ecbc9fd05cff40e22687ebedc5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 104a3acf3..13f54e05a 100644
+index 104a3acf31..13f54e05ab 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -359,4 +359,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 104a3acf3..13f54e05a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 213d0b18c..ebe397b15 100644
+index 213d0b18c9..ebe397b15a 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -752,6 +752,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0155-Optimize-ItemStack.isEmpty.patch
index c8a416f0f4..60be2dc9ef 100644
--- a/Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0155-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 127e1e338fa2acd16ab6a7ca19ae1e504dd65bac Mon Sep 17 00:00:00 2001
+From 853a5b33b53b85bff4fe55e2b8f50e68b1d044e2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index e0f782acc..865ff2ee1 100644
+index 37d37f1f64..927394333a 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -151,7 +151,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0157-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0156-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 6679bbf15b..dce19231fe 100644
--- a/Spigot-Server-Patches/0157-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0156-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From ebeb314b54e8b23b554ebfa4befb22e8191e0a88 Mon Sep 17 00:00:00 2001
+From 80e8e20cd171794077cc488a21f686a4e586fbd3 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index d19d24683..5945e37a5 100644
+index cdbc82bf9e..b570882340 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index d19d24683..5945e37a5 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..124c3185b 100644
+index 2b66a08ade..124c3185bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -52,5 +52,5 @@ index 2b66a08ad..124c3185b 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.21.0
 
diff --git a/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0157-Properly-fix-item-duplication-bug.patch
index 6428b0b3c2..112759ad4f 100644
--- a/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0157-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From a45c886770943c8e1893a1bc1163b4212f1988b9 Mon Sep 17 00:00:00 2001
+From cc45f36d257d5838e9293dd0bd31353bf3950949 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6b9bbc77c..e4e1d999e 100644
+index 6b9bbc77c0..e4e1d999e9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1567,7 +1567,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index 6b9bbc77c..e4e1d999e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d54f00037..eb232533c 100644
+index 4a06527b6f..1c4842a263 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2484,7 +2484,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2485,7 +2485,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public final boolean isDisconnected() {
diff --git a/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0158-String-based-Action-Bar-API.patch
index 0619d65f28..a7f0f041d6 100644
--- a/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0158-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From aa230590808b0776260e52ea7018c88bb1462324 Mon Sep 17 00:00:00 2001
+From d4a4bb2f503564a74e49d7640f1273c1977cd253 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@@ -42,7 +42,7 @@ index c97e116aaf..e1af5c4885 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ecef2a6ad6..35eb4279ec 100644
+index 59bfcce68d..c5f2284553 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -207,6 +207,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index ecef2a6ad6..35eb4279ec 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0160-Firework-API-s.patch b/Spigot-Server-Patches/0159-Firework-API-s.patch
index 438fba29ee..4f26ec4b84 100644
--- a/Spigot-Server-Patches/0160-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0159-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From d3c8e46af030489991d076c9e2cc636b93013f8f Mon Sep 17 00:00:00 2001
+From 9432bcdfe213cdd8fa3b301413db8e7b0bae3b3b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 9b6d217df..9764c76fb 100644
+index 9b6d217df8..9764c76fba 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -54,7 +54,7 @@ index 9b6d217df..9764c76fb 100644
  
      public boolean bk() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 68bd2af26..dbb422e9d 100644
+index 68bd2af261..dbb422e9da 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -16,6 +16,7 @@ public class ItemFireworks extends Item {
@@ -74,7 +74,7 @@ index 68bd2af26..dbb422e9d 100644
                  world.addEntity(entityfireworks);
                  if (!entityhuman.abilities.canInstantlyBuild) {
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 8c5d6c1d3..d4165f7e4 100644
+index 8c5d6c1d38..d4165f7e44 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -107,7 +107,7 @@ public class NBTTagCompound implements NBTBase {
@@ -87,7 +87,7 @@ index 8c5d6c1d3..d4165f7e4 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 7b3b20682..b39e33f4f 100644
+index 7b3b206823..b39e33f4f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
@@ -130,5 +130,5 @@ index 7b3b20682..b39e33f4f 100644
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0160-PlayerTeleportEndGatewayEvent.patch
index d1ef2ac37d..c30721dbb2 100644
--- a/Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0160-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 44bfbea03ead23fa4f965221541ea75158baca92 Mon Sep 17 00:00:00 2001
+From 656d256bb375706e0843d0c2ddf0843c7c9a358a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 1d934170f..af71c7c48 100644
+index a7efe5664a..d2b29ecbe0 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -126,7 +126,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index 1d934170f..af71c7c48 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.20.0
+2.21.0
 
diff --git a/Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0161-ShulkerBox-Dupe-Prevention.patch
index 291efd3156..cc798de166 100644
--- a/Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0161-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From b29be1d2fea8597e02b6dfc3bd4ebe0096c7bb30 Mon Sep 17 00:00:00 2001
+From 16ba1e065d52597408a18d8bbb9fa3686271fc6a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index ab0ece55..997ed795 100644
+index ab0ece557c..997ed795b1 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -100,6 +100,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index ab0ece55..997ed795 100644
              }
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.20.1.windows.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0162-Provide-E-TE-Chunk-count-stat-methods.patch
index 8db5ba3314..f47ae991f5 100644
--- a/Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0162-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 0a1c98cd6d921fbfffc583a8bcd6291165f93646 Mon Sep 17 00:00:00 2001
+From c2d5c09d75edae0d2352770fcbd4cb9ca21cf714 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cecdc5388..864151444 100644
+index f7883e7085..010c5fc731 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -88,6 +88,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index cecdc5388..864151444 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0163-Enforce-Sync-Player-Saves.patch
index bd8891a6b7..7465108da9 100644
--- a/Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0163-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 3bffc7dc5c318939eb7b3da34574cdbe10710e66 Mon Sep 17 00:00:00 2001
+From 6dac784f4401b784add8dd0703128ff13c4ae288 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2c3ed3723..0bc27d914 100644
+index fe6649224a..9570a8800b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1214,6 +1214,7 @@ public abstract class PlayerList {
@@ -27,5 +27,5 @@ index 2c3ed3723..0bc27d914 100644
      // Paper end
  
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0164-Enforce-Sync-Chunk-Unloads.patch
index 83956ee3d8..d57737b938 100644
--- a/Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0164-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 2e7dfd9a66cf68126c90c5a3a591f0acc5814990 Mon Sep 17 00:00:00 2001
+From 07d5f44136276bd9b2e3faaf2454084a5fb16776 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 864151444..0f3bf13ef 100644
+index 010c5fc731..6718028190 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -236,6 +236,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index 864151444..0f3bf13ef 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0165-Don-t-allow-entities-to-ride-themselves-572.patch
index 29d422ba5e..8d50715447 100644
--- a/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0165-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From 4bc2336680d437f7decc95ba9ea8e866e22525d7 Mon Sep 17 00:00:00 2001
+From 9e46153783206330175be6c33c41155fbd865d16 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 309ad0219..184b59f03 100644
+index b6ed9082fd..80ff428656 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2094,6 +2094,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0167-Fix-block-break-desync.patch b/Spigot-Server-Patches/0166-Fix-block-break-desync.patch
index 9ab5de2826..c9f7e09cbe 100644
--- a/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0166-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From 7e47e348b20317ee5b66849ff43520037121d4c2 Mon Sep 17 00:00:00 2001
+From 5ae8df3009225b24837b764e02db1f24fd6ad265 Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eb232533c..74d880e03 100644
+index 1c4842a263..05cc5afea6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1136,6 +1136,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0167-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 079b7aad2a..2339dd351c 100644
--- a/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0167-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From e9824b65b2515743090f724cbc535d1297ffb033 Mon Sep 17 00:00:00 2001
+From 8ca07b6a51fa3b4c31456f4a0363422607a712d5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 1dc13fcc3..c674aa13d 100644
+index 1dc13fcc30..c674aa13d8 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -450,13 +450,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index 1dc13fcc3..c674aa13d 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index b3fbc8249..79d8be8d4 100644
+index b3fbc8249e..79d8be8d46 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index b3fbc8249..79d8be8d4 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 3030dd9c3..404a222b4 100644
+index 3030dd9c31..404a222b45 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@@ -120,7 +120,7 @@ index 3030dd9c3..404a222b4 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index c13e1ff6f..7fb136a2d 100644
+index 202b8d2158..ee71c326ae 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -468,7 +468,7 @@ public class EntityFishingHook extends Entity {
@@ -133,7 +133,7 @@ index c13e1ff6f..7fb136a2d 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c0ef0c51f..3bc1f8f9b 100644
+index c0ef0c51f1..3bc1f8f9b5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
@@ -147,7 +147,7 @@ index c0ef0c51f..3bc1f8f9b 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index a5e1939e0..e73dba09a 100644
+index a5e1939e05..e73dba09a6 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ebe397b15..78acac4ca 100644
+index ebe397b15a..78acac4ca7 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -412,7 +412,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -173,7 +173,7 @@ index ebe397b15..78acac4ca 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index bf061cf06..55f978768 100644
+index bf061cf064..55f9787680 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -186,7 +186,7 @@ index bf061cf06..55f978768 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 0baf0100c..6ae6afa33 100644
+index 0baf0100c9..6ae6afa339 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -391,7 +391,7 @@ public class PlayerInteractManager {
@@ -199,7 +199,7 @@ index 0baf0100c..6ae6afa33 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 5ac554d65..d70c4dda5 100644
+index 5ac554d65e..d70c4dda5a 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -221,7 +221,7 @@ index 5ac554d65..d70c4dda5 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 671802819..d72f393a7 100644
+index 6718028190..d72f393a75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1354,7 +1354,7 @@ public class CraftWorld implements World {
@@ -234,7 +234,7 @@ index 671802819..d72f393a7 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d..3302af0e4 100644
+index 3a09cab3d4..3302af0e45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
diff --git a/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0168-Cap-Entity-Collisions.patch
index 2f80c9a66d..967a9835f0 100644
--- a/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0168-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From c60ecc3058c029c6315331763fd8039cfd663085 Mon Sep 17 00:00:00 2001
+From fcb228cc399c4d659994a49376ae0a7bebe6a61d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 13f54e05a..72eb530d7 100644
+index 13f54e05ab..72eb530d7e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -369,4 +369,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 13f54e05a..72eb530d7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 184b59f03..3773cc1bf 100644
+index 80ff428656..291a304172 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
@@ -39,7 +39,7 @@ index 184b59f03..3773cc1bf 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3bc1f8f9b..34fbf8362 100644
+index 3bc1f8f9b5..34fbf83621 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2355,8 +2355,11 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0169-Remove-CraftScheduler-Async-Task-Debugger.patch
index d361b4b48c..1923503eb9 100644
--- a/Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0169-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 6423b00e10d13cca4c4e7b337143ddddae821be2 Mon Sep 17 00:00:00 2001
+From db940aa3927da56a0d8eb595198bd9c9341379cf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 0e9d5fe3a..3ef79e3e9 100644
+index 0e9d5fe3a7..3ef79e3e94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -412,7 +412,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -47,5 +47,5 @@ index 0e9d5fe3a..3ef79e3e9 100644
  
      @Deprecated
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0171-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0170-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 97b8d251a2..440b7117ec 100644
--- a/Spigot-Server-Patches/0171-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0170-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From 20c2db8c795362826ee89ca434c7e81866d572b6 Mon Sep 17 00:00:00 2001
+From 5d07c6b4f0e47adab15bb8f1ef878b92af6b715c Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 299776728..41926a361 100644
+index 2997767282..41926a361b 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -313,7 +313,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0172-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0171-Do-not-let-armorstands-drown.patch
index 34874f01f8..2d70de4db6 100644
--- a/Spigot-Server-Patches/0172-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0171-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 96b6468f9d3118627a6097dbc92e3f1e18e1bfc2 Mon Sep 17 00:00:00 2001
+From acb04e7af931a4ae09b5ac254c3e29220e1976fd Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index b57088234..694df9e18 100644
+index b570882340..694df9e185 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -763,5 +763,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index b57088234..694df9e18 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 34fbf8362..138a224e0 100644
+index 34fbf83621..138a224e04 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -202,6 +202,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0173-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0172-Properly-handle-async-calls-to-restart-the-server.patch
index 95841adee9..c772e3b152 100644
--- a/Spigot-Server-Patches/0173-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0172-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From d7b4a418de5fffaf1e4667ae79065bba032605fe Mon Sep 17 00:00:00 2001
+From b7ea92e1f8098d7899cc53e97cbb602b9f2f24e5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6283c774d..db511c1fe 100644
+index 6283c774d6..db511c1fe8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -85,6 +85,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -68,7 +68,7 @@ index 6283c774d..db511c1fe 100644
      private boolean canSleepForTick() {
          return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9570a8800..9d44dcb3b 100644
+index 9570a8800b..9d44dcb3b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1336,10 +1336,15 @@ public abstract class PlayerList {
@@ -97,7 +97,7 @@ index 9570a8800..9d44dcb3b 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 944151d14..061cbe7fc 100644
+index 944151d140..061cbe7fcf 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,86 +46,123 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0174-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0173-Add-system-property-to-disable-book-size-limits.patch
index 458ea3767f..a0cba85a5b 100644
--- a/Spigot-Server-Patches/0174-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0173-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From e2b577bd48746070ebc879711993cb290b1dd3d8 Mon Sep 17 00:00:00 2001
+From e5c716622f3a6f09eb0d1977ba6eebcf0d296973 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index a23ec1461..20cddd506 100644
+index a23ec1461d..20cddd5065 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
diff --git a/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0174-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 07fbb8591f..ea5e65fab6 100644
--- a/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0174-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From b4c5f00c5a060d72fd6f43891e9b70a895153a67 Mon Sep 17 00:00:00 2001
+From 9fa77cfb17de18c16aaa9f1bf8a73f2a841c3ef8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 72eb530d7..8ff454e25 100644
+index 72eb530d7e..8ff454e259 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -375,4 +375,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 72eb530d7..8ff454e25 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5e5a747e9..23e7cdfe8 100644
+index 5e5a747e9f..23e7cdfe88 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -465,7 +465,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,10 +39,10 @@ index 5e5a747e9..23e7cdfe8 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 74d880e03..b906615e3 100644
+index 05cc5afea6..ac64fcfb31 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1735,6 +1735,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1736,6 +1736,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          switch (packetplayinentityaction.c()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
diff --git a/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0175-Add-configuration-option-to-prevent-player-names-fro.patch
index 1552ac0b65..62194c8a3d 100644
--- a/Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0175-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 333f45be7ee9d1fe67eaff5df605f74052db7228 Mon Sep 17 00:00:00 2001
+From 382faa5dd1c013c3dab3034934534a8fcbe2ea0b Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 17b4e01aa..d10d60921 100644
+index 17b4e01aa4..d10d60921b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 17b4e01aa..d10d60921 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bb7792ce2..962170cd3 100644
+index bb7792ce2a..962170cd3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2141,5 +2141,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0176-Use-TerminalConsoleAppender-for-console-improvements.patch
index 3954bec9c2..07d458753e 100644
--- a/Spigot-Server-Patches/0177-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0176-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 13eecfd7e9966c44ced76ef7b62ab5454a62c990 Mon Sep 17 00:00:00 2001
+From b6d424028e3980f33b12cf8b24fc51eaf7f3a613 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 51cefc0a1..2b73ec28a 100644
+index 51cefc0a1b..2b73ec28a1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -75,7 +75,7 @@ index 51cefc0a1..2b73ec28a 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..688b4715e
+index 0000000000..688b4715eb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 000000000..688b4715e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 0000000000..685deaa0e5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4e9ef43b4..5bb1ea880 100644
+index 4e9ef43b45..5bb1ea880a 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 4e9ef43b4..5bb1ea880 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db511c1fe..c6ecdf6e8 100644
+index db511c1fe8..c6ecdf6e8e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -56,7 +56,6 @@ import org.apache.commons.lang3.Validate;
@@ -243,7 +243,7 @@ index db511c1fe..c6ecdf6e8 100644
  
      public KeyPair E() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d44dcb3b..8bb3fef21 100644
+index 9d44dcb3b2..8bb3fef21e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -77,8 +77,7 @@ public abstract class PlayerList {
@@ -257,7 +257,7 @@ index 9d44dcb3b..8bb3fef21 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 962170cd3..7e4f42b3f 100644
+index 962170cd3f..7e4f42b3f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -146,8 +146,8 @@ import java.nio.ByteBuffer;
@@ -285,7 +285,7 @@ index 962170cd3..7e4f42b3f 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0c70f6700..04991c991 100644
+index 472a8070e7..4102e19700 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -324,10 +324,10 @@ index 0c70f6700..04991c991 100644
 +                    System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb894..000000000
+index 26a2fb8942..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -406,7 +406,7 @@ index 26a2fb894..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c..1e3aae3b8 100644
+index 33e8ea02c4..1e3aae3b8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -485,7 +485,7 @@ index 33e8ea02c..1e3aae3b8 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 984df4083..bbb5a84f3 100644
+index 984df4083d..bbb5a84f36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
@@ -499,7 +499,7 @@ index 984df4083..bbb5a84f3 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b64097113..000000000
+index b640971130..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -558,7 +558,7 @@ index b64097113..000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00e..08b6bb7f9 100644
+index 5cee8f00ef..08b6bb7f97 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
diff --git a/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0177-provide-a-configurable-option-to-disable-creeper-lin.patch
index f8d9b904eb..5fabded05b 100644
--- a/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0177-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From ffbd793d22aefce0315f601cc89e85ff0e01dc9b Mon Sep 17 00:00:00 2001
+From 23d7e81210b0cf3e58cfaeb0a8362a20b1cf8c38 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8ff454e25..3baf0380c 100644
+index 8ff454e259..3baf0380c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -381,4 +381,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 8ff454e25..3baf0380c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 81e602d1b..b6af42904 100644
+index 81e602d1b9..b6af429044 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -214,7 +214,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0179-Item-canEntityPickup.patch b/Spigot-Server-Patches/0178-Item-canEntityPickup.patch
index 110a28be9c..032db69848 100644
--- a/Spigot-Server-Patches/0179-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0178-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 796cef655af2544409704e96ea3c7751594268f3 Mon Sep 17 00:00:00 2001
+From 1853596fcd97ca2e82211602010b3c14e08ffbf7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index c53082459..98e214cdd 100644
+index c530824596..98e214cdd6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -530,6 +530,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index c53082459..98e214cdd 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 9b854d64f..39a804b7c 100644
+index 9b854d64fb..39a804b7cb 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -13,6 +13,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index 9b854d64f..39a804b7c 100644
      private UUID f;
      private UUID g;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 55d6bacf7..6036592f7 100644
+index 55d6bacf77..6036592f76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -45,6 +45,16 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/Spigot-Server-Patches/0180-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0179-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 5dd11660ae..689cc5ee09 100644
--- a/Spigot-Server-Patches/0180-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0179-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From 1afd93a126d91c9ed1d852bc9c065c6dbdd29ec0 Mon Sep 17 00:00:00 2001
+From 7146ff6a0122d0a286b5bda25234c78a43bbb4bd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 39a804b7c..921a56c31 100644
+index 39a804b7cb..921a56c312 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -308,6 +308,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0181-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0180-PlayerAttemptPickupItemEvent.patch
index 38ebf41cb2..4a63b7903a 100644
--- a/Spigot-Server-Patches/0181-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0180-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From eb450153843e8b028207b2d7e854a092289ea7b6 Mon Sep 17 00:00:00 2001
+From a52801098de2cc54251d3838c161e80c207f0277 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 643793d55..85f80741c 100644
+index 921a56c312..e9986420c2 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0182-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0181-Add-UnknownCommandEvent.patch
index 248b941cea..e8f2594f20 100644
--- a/Spigot-Server-Patches/0182-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0181-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 03c187679f3139c3228ee5d763f7c08474ced30b Mon Sep 17 00:00:00 2001
+From 000033b190d3ae3628da53a244ebda476e91e045 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <[email protected]>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9cf2ee957..6dad8fab2 100644
+index 7e4f42b3f4..e8991ce1c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -83,6 +83,7 @@ import org.bukkit.craftbukkit.util.Versioning;
diff --git a/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0182-Basic-PlayerProfile-API.patch
index e255062d6b..0dfb1b38a7 100644
--- a/Spigot-Server-Patches/0183-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0182-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From b18a6e1b22b0928f9d1a2788e5424a406f245a92 Mon Sep 17 00:00:00 2001
+From 84287d566df3a35f5121f707f2801f9ca9d325b8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..b151a13c1
+index 0000000000..b151a13c1b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 000000000..b151a13c1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 000000000..25836b975
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 000000000..3bcdb8f93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 000000000..4b2a67423
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index e1af5c488..0ef5ad116 100644
+index e1af5c4885..0ef5ad1165 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index e1af5c488..0ef5ad116 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c6ecdf6e8..5517c5fe8 100644
+index c6ecdf6e8e..5517c5fe81 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1186,7 +1186,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -450,7 +450,7 @@ index c6ecdf6e8..5517c5fe8 100644
          return this.V;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 9bf2521be..059665836 100644
+index 9bf2521be6..0596658362 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index 9bf2521be..059665836 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e8991ce1c..1e8c4a85c 100644
+index e8991ce1c9..1e8c4a85cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -164,6 +164,10 @@ import org.bukkit.event.server.ServerLoadEvent;
diff --git a/Spigot-Server-Patches/0184-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0183-Shoulder-Entities-Release-API.patch
index 9a79200415..6eb22a93be 100644
--- a/Spigot-Server-Patches/0184-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0183-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From 136778b9063d11c79042422caeed11e550c8004e Mon Sep 17 00:00:00 2001
+From 8b06af0c55201686c142c01024a4fa994b130307 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 23e7cdfe8..298012f37 100644
+index 23e7cdfe88..298012f37c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1831,21 +1831,48 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index 23e7cdfe8..298012f37 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 79d125567..d5dbc4ca8 100644
+index 79d1255676..d5dbc4ca81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -556,6 +556,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0185-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0184-Profile-Lookup-Events.patch
index 3c86ac662c..25655ace8e 100644
--- a/Spigot-Server-Patches/0185-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0184-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 0db7caa6c1fffb8a75ca04e449016be2d771c7b0 Mon Sep 17 00:00:00 2001
+From 62fe5662571b58921aed09ccdc85810a5e2061b6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93..bb9894318 100644
+index 3bcdb8f93f..bb9894318e 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -1,17 +1,68 @@
diff --git a/Spigot-Server-Patches/0186-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0185-Block-player-logins-during-server-shutdown.patch
index 9389a294b6..f91308ab9e 100644
--- a/Spigot-Server-Patches/0186-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0185-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From d234eb539c27dc62a73b839a01389fc6d2489169 Mon Sep 17 00:00:00 2001
+From ed322683af055029de337dbc60c07d8cf30e86b1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index e901c066a..852dc7162 100644
+index e901c066ac..852dc7162a 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0186-Entity-fromMobSpawner.patch
index f8a4c4b5a8..65ec23e08e 100644
--- a/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0186-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 1c90168eb25629a9e0da66888bb23a91100e7b61 Mon Sep 17 00:00:00 2001
+From 8ca9f8cb42942c15263e253d5c42e16b379285f3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3773cc1bf..1bb79a61e 100644
+index 291a304172..92a15ba947 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
@@ -37,7 +37,7 @@ index 3773cc1bf..1bb79a61e 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 466750f77..84a58c7dc 100644
+index 466750f779..84a58c7dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -855,5 +855,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0187-Fix-Anvil-Level-sync-to-client.patch
index 722c5b4f04..16ad8709f9 100644
--- a/Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0187-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 4dd7cd6ff065e63d4491c46a078e5d08ca3672b2 Mon Sep 17 00:00:00 2001
+From 701f704672d685a7c1683c9a4f7c4055e3c4fcdc Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index a6ac51614..1560dd382 100644
+index a6ac516147..1560dd382a 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -375,9 +375,9 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index a6ac51614..1560dd382 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c5f228455..d85e62252 100644
+index c5f2284553..d85e622525 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1405,6 +1405,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0188-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index e35003e776..9a853650af 100644
--- a/Spigot-Server-Patches/0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0188-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From 3d463a5ec0887a8c0424ba171b16bd835c64fade Mon Sep 17 00:00:00 2001
+From 22ee365ac0b8d43053a9aa2db059eb17738ef115 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 15736f757..ee09f4c5a 100644
+index 15736f7575..ee09f4c5a0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -217,6 +217,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0190-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0189-Improve-the-Saddle-API-for-Horses.patch
index ae7ecf7e20..3e55e08cc2 100644
--- a/Spigot-Server-Patches/0190-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0189-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From e44afb8723f21042ad1a3dfe0fcaee71a3df3540 Mon Sep 17 00:00:00 2001
+From 7b02067570d465d1f87f32920b8f36099008c710 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 14d041680..e56bef334 100644
+index 14d0416802..e56bef3340 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 14d041680..e56bef334 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 173818e68..2f6852404 100644
+index 173818e682..2f68524049 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@@ -41,7 +41,7 @@ index 173818e68..2f6852404 100644
          super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 000000000..99cfbaf90
+index 0000000000..99cfbaf90b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
diff --git a/Spigot-Server-Patches/0191-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0190-Implement-ensureServerConversions-API.patch
index f89f2e0d84..ddd53838b2 100644
--- a/Spigot-Server-Patches/0191-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0190-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 9cd2c4f8729a798dcc81ec4cc9cc37c44d3cd489 Mon Sep 17 00:00:00 2001
+From 70223002377dc229edfeaf45d328d3f17ee4fbf1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 52041caed..f5fa58d6c 100644
+index 52041caedc..f5fa58d6cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -294,4 +294,10 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0192-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0191-Implement-getI18NDisplayName.patch
index 138b593e05..c04d505a6c 100644
--- a/Spigot-Server-Patches/0192-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0191-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 8e20d707407fcd2fafad7ad1eda1dd7906fcb3ff Mon Sep 17 00:00:00 2001
+From d7ec5666d9d230e0ce0dec15ff7e7d659c75f5dc Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 747b8ad4d..4c5556a09 100644
+index 747b8ad4de..4c5556a096 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -44,10 +44,12 @@ public class LocaleLanguage {
@@ -25,7 +25,7 @@ index 747b8ad4d..4c5556a09 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index f5fa58d6c..3a6e6f687 100644
+index f5fa58d6cc..3a6e6f687d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -299,5 +299,18 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0192-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 39f830208f..23d403bd48 100644
--- a/Spigot-Server-Patches/0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0192-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From b7c4fc493b7bd6aaf28dacd893e41c2ea5dd0ad3 Mon Sep 17 00:00:00 2001
+From bd45d8941e1364a7c28282e3fe90d3c5bc24fee8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne
 It's triggered when Hell/End worlds are empty of players.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ab4f3b722..e428d4485 100644
+index ab4f3b7223..e428d4485b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -186,7 +186,7 @@ public class PlayerChunkMap {
diff --git a/Spigot-Server-Patches/0194-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0193-ProfileWhitelistVerifyEvent.patch
index 18aa258ff9..befac7675a 100644
--- a/Spigot-Server-Patches/0194-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0193-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From a27b596d7218425400bb7ead328db1de31f33bc9 Mon Sep 17 00:00:00 2001
+From 6b5a66b6dc3f5c6a722153e708ef3884d5e8066c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8bb3fef21..96eff10ff 100644
+index 8bb3fef21e..96eff10ffa 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -543,9 +543,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0195-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0194-Fix-this-stupid-bullshit.patch
index 21ce2b1ddd..a338c9b494 100644
--- a/Spigot-Server-Patches/0195-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0194-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 1e6c11f9a5dd6028668fc391de996e39c2cf01fa Mon Sep 17 00:00:00 2001
+From 55397606a09c8ea5deecea742516e8badfdad445 Mon Sep 17 00:00:00 2001
 From: DemonWav <[email protected]>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 04991c991..2d5167eb9 100644
+index 4102e19700..b145b55bc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
diff --git a/Spigot-Server-Patches/0196-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0195-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 81512da0a7..527dc59e6c 100644
--- a/Spigot-Server-Patches/0196-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0195-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From b5b1b9834e7d3e8b44ff6719550e36679e212df0 Mon Sep 17 00:00:00 2001
+From ad5ce22ff3f19ec60b6b8d096b019cedb7964ebb Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 47aac5b05..ba074c10c 100644
+index 47aac5b057..ba074c10c6 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -61,7 +61,7 @@ public class EntityOcelot extends EntityTameableAnimal {
diff --git a/Spigot-Server-Patches/0197-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0196-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index a905c166dd..11b746d3ad 100644
--- a/Spigot-Server-Patches/0197-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0196-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From 8ff001f7d0039fb84f6d34574bcc8d48f8a81d3f Mon Sep 17 00:00:00 2001
+From 559b3a1c59758c2ab0ff16debdd5529623c02956 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 98065d6b0..027ba7191 100644
+index 98065d6b02..027ba71918 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -121,6 +121,9 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0198-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0197-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index e6c934789b..71453083cd 100644
--- a/Spigot-Server-Patches/0198-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0197-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,4 +1,4 @@
-From a704cf4fe36a950d5957af844c1cb51ab661f917 Mon Sep 17 00:00:00 2001
+From 15cd669dcb33567293742d5942ca735b544822d1 Mon Sep 17 00:00:00 2001
 From: mezz <[email protected]>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
diff --git a/Spigot-Server-Patches/0199-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0198-Allow-specifying-a-custom-authentication-servers-dow.patch
index dffe9bd408..04850d36ca 100644
--- a/Spigot-Server-Patches/0199-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0198-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 6f22953638e079923027657ef4c892958c04786c Mon Sep 17 00:00:00 2001
+From fee8c1007a09297383dd293f9003f41e347c37c7 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0f38b1fb4..68c287026 100644
+index d10d60921b..2b5dde6d99 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index 0f38b1fb4..68c287026 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 852dc7162..74bc08f85 100644
+index 852dc7162a..74bc08f85c 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -239,6 +239,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0200-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0199-LivingEntity-setKiller.patch
index af2973c39c..394192e7b0 100644
--- a/Spigot-Server-Patches/0200-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0199-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From f2fdf943d649d1e7f0dd770429734dbedf0a169c Mon Sep 17 00:00:00 2001
+From 7329a5ba4aec7f44664e5d1580eb7982602dc0ff Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 716eda990..2f96842bb 100644
+index 716eda9902..2f96842bb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -278,6 +278,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0201-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0200-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 2124b08894..b28a0a32e0 100644
--- a/Spigot-Server-Patches/0201-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0200-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From a7fc738505f8be1140eb7e8e4a74a422d929fec4 Mon Sep 17 00:00:00 2001
+From 24b3889d4c1ca6119886c22819850d47bf9ce2bd Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index 2b73ec28a..0a6e81b68 100644
+index 2b73ec28a1..0a6e81b680 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index 2b73ec28a..0a6e81b68 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 5bb1ea880..0d2c7a6dc 100644
+index 5bb1ea880a..0d2c7a6dc4 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0202-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0201-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 49503dd167..ac578e6cd5 100644
--- a/Spigot-Server-Patches/0202-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0201-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From bf174349f34fa396748aa3fefeb5b3765aecb79d Mon Sep 17 00:00:00 2001
+From fbb71c462a42540cf6eadfe9769bf6b92cba0c94 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 0a6e81b68..82b9cae16 100644
+index 0a6e81b680..82b9cae166 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -28,7 +28,7 @@ index 0a6e81b68..82b9cae16 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index fe3bad583..56f135f24 100644
+index fe3bad5830..56f135f244 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -291,7 +291,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index fe3bad583..56f135f24 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f9..9f8334376 100644
+index 08b6bb7f97..9f8334376f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
diff --git a/Spigot-Server-Patches/0203-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0202-Include-Log4J2-SLF4J-implementation.patch
index f2ccac1a01..3c3cfa5a8b 100644
--- a/Spigot-Server-Patches/0203-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0202-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 8a93355be0a60b6692ec9a4515a3d07ea9f0f772 Mon Sep 17 00:00:00 2001
+From e12eabca265e425f44c2bcae003dc7d3f7716da5 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 82b9cae16..3ad5af346 100644
+index 82b9cae166..3ad5af3463 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
diff --git a/Spigot-Server-Patches/0204-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0203-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 1c86ca1d4f..bb8bfc8e7e 100644
--- a/Spigot-Server-Patches/0204-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0203-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 93a6d899b73fcd1b580a5862a131a9bd1a9b95ba Mon Sep 17 00:00:00 2001
+From bf7855cdd2469f6ee51b72d01e98685fe6951675 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376..6711e6dff 100644
+index 9f8334376f..6711e6dff9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
diff --git a/Spigot-Server-Patches/0205-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0204-Add-PlayerJumpEvent.patch
index fb2e7c9c45..954f8007f8 100644
--- a/Spigot-Server-Patches/0205-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0204-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From 84a6783cd3595a4bdb66615d1fc102cdf5610eff Mon Sep 17 00:00:00 2001
+From 089a524589f6065314534ab6607df461a97426e0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 298012f37..bfae875eb 100644
+index 298012f37c..bfae875ebb 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1483,6 +1483,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index 298012f37..bfae875eb 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b906615e3..af73bb781 100644
+index ac64fcfb31..5fa3268b59 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0206-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0205-handle-PacketPlayInKeepAlive-async.patch
index cfe6ab209b..8cae7e3a2b 100644
--- a/Spigot-Server-Patches/0206-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0205-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From f53f4fdc96bb535750db0518c5e9269501feb8f8 Mon Sep 17 00:00:00 2001
+From 5b9b0efc388810e9be0e7b7ccc532a7e8cbcc10b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index af73bb781..2fa9f797d 100644
+index 5fa3268b59..0d87ddc0f5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2450,14 +2450,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2451,14 +2451,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/Spigot-Server-Patches/0207-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0206-Expose-client-protocol-version-and-virtual-host.patch
index 2e135ed1aa..2760ee13ac 100644
--- a/Spigot-Server-Patches/0207-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0206-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 375da7221eb8bd8940c2f389e0b935bff3be8dc5 Mon Sep 17 00:00:00 2001
+From 6c0a39d7388e9bfbe78da5bf42868cb6bab7c588 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 000000000..5caca6439
+index 0000000000..5caca6439d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 93ca93b64..e732d55f9 100644
+index 93ca93b640..e732d55f9f 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 93ca93b64..e732d55f9 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e2fc41d6d..2ff2549d0 100644
+index e2fc41d6d1..2ff2549d0e 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,6 +62,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index e2fc41d6d..2ff2549d0 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 7acdac55e..f1a3be69d 100644
+index 7acdac55e5..f1a3be69d0 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 7acdac55e..f1a3be69d 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7a74ce26d..01547b31e 100644
+index d85e622525..dafc2948c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -174,6 +174,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0208-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0207-revert-serverside-behavior-of-keepalives.patch
index f09764eb9f..27691fa873 100644
--- a/Spigot-Server-Patches/0208-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0207-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 8459f954517d4b6d5e7dc22acdb0a40950ebeedd Mon Sep 17 00:00:00 2001
+From f675c65d7d47b07c993b7d741418f9b6f15ec079 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2fa9f797d..bae10827a 100644
+index 0d87ddc0f5..551740ec6c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0209-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0208-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index ec07bf45b9..ad3efa1f54 100644
--- a/Spigot-Server-Patches/0209-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0208-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 3ecd162dfc41c5b05c150cb01f290922298658fb Mon Sep 17 00:00:00 2001
+From 5e1b6f44000755e1b473737e27c13fdc6a2a46a6 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList
 Fixes https://github.com/PaperMC/Paper/issues/588
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
-index 80a5c29f3..cd864c404 100644
+index 80a5c29f3b..cd864c4047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 @@ -8,7 +8,7 @@ import java.util.TreeSet;
diff --git a/Spigot-Server-Patches/0210-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0209-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index b3c089a28b..f44c873755 100644
--- a/Spigot-Server-Patches/0210-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0209-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 7b8d804737438542137a97aa878c053de13bfc6f Mon Sep 17 00:00:00 2001
+From f94e3680ce72b843b725ae03807974c2816d210f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index bfae875eb..259f73f66 100644
+index bfae875ebb..259f73f66e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -989,6 +989,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index bfae875eb..259f73f66 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5b589e76f..f2aa22d28 100644
+index cdb430ef4f..cdef374c61 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -954,6 +954,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0210-Option-for-maximum-exp-value-when-merging-orbs.patch
index 3946de4a72..571ab3a1f0 100644
--- a/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0210-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From 896911a34642dd25f670d30ad85288eb6a23bf73 Mon Sep 17 00:00:00 2001
+From 9fe4a6075e6fa09371163a89977cededa88ae9c3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3baf0380c..c9422d545 100644
+index 3baf0380c0..c9422d545a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -387,4 +387,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 3baf0380c..c9422d545 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9cbbfed4f..2985c76f3 100644
+index 9cbbfed4fe..2985c76f37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -394,16 +394,32 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0212-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0211-Add-PlayerArmorChangeEvent.patch
index 09bee87998..193d0f44d8 100644
--- a/Spigot-Server-Patches/0212-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0211-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From f6f8fb674c021e3a90a454293b48a30266b9297a Mon Sep 17 00:00:00 2001
+From 6983ce9beb5d9de6bbc77810cee8af4b4cc3bb6b Mon Sep 17 00:00:00 2001
 From: pkt77 <[email protected]>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 138a224e0..02fcfc449 100644
+index 138a224e04..02fcfc449c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index 138a224e0..02fcfc449 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index a9a133993..8f4b5dca9 100644
+index a9a1339933..8f4b5dca94 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
diff --git a/Spigot-Server-Patches/0213-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0212-Prevent-logins-from-being-processed-when-the-player-.patch
index 0e90043d5d..29ffff60a8 100644
--- a/Spigot-Server-Patches/0213-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0212-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From dba7e75cc4f2211fecff50af7244c22b7c81d14c Mon Sep 17 00:00:00 2001
+From 60b37d35e44ae9b29a142bf1a33b4b750906059a Mon Sep 17 00:00:00 2001
 From: killme <[email protected]>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 74bc08f85..15c01333e 100644
+index 74bc08f85c..15c01333e7 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0214-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0213-use-CB-BlockState-implementations-for-captured-block.patch
index 6dca0fd4f1..421c1814e8 100644
--- a/Spigot-Server-Patches/0214-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0213-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 695f4e218ac0761bb6a099d7f2d7e93d028674ba Mon Sep 17 00:00:00 2001
+From 8e4968e7640c46591f5442686ef86bc5cf1bd401 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f2aa22d28..08ad88c14 100644
+index cdef374c61..d87b08a49e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -395,7 +395,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0215-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0214-API-to-get-a-BlockState-without-a-snapshot.patch
index 7e92c598e8..f95b101366 100644
--- a/Spigot-Server-Patches/0215-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0214-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 81858dadc6c83ef90c21a41f1a04ca57728cfcba Mon Sep 17 00:00:00 2001
+From a6c89447b205715e04b8a8e86ad3f7af4733cdc9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b3c5766a2..29fe031d8 100644
+index b3c5766a27..29fe031d85 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -206,7 +206,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,7 +39,7 @@ index b3c5766a2..29fe031d8 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 4b4fdf93f..7ae4b7952 100644
+index 4b4fdf93f6..7ae4b7952f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -275,6 +275,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index 4b4fdf93f..7ae4b7952 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 4f4121adc..082a1b6e2 100644
+index 4f4121adca..082a1b6e20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -23,20 +23,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 4f4121adc..082a1b6e2 100644
  
      private T createSnapshot(T tileEntity, World world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index e6f86cc4b..3a8f64360 100644
+index e6f86cc4b1..3a8f643609 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -15,10 +15,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
diff --git a/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0215-AsyncTabCompleteEvent.patch
index 1a66cc0f45..80fec6e18e 100644
--- a/Spigot-Server-Patches/0216-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0215-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From d33a4d96ec866b65c24939762aa3a47b8d5dc033 Mon Sep 17 00:00:00 2001
+From ea000bfea5378094525b8c3778c8e8a9af11626b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bae10827a..273385ee0 100644
+index 551740ec6c..2f00929f63 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -507,10 +507,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -70,7 +70,7 @@ index bae10827a..273385ee0 100644
  
      public void a(PacketPlayInSetCommandBlock packetplayinsetcommandblock) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1e8c4a85c..8315f6377 100644
+index 1e8c4a85cb..8315f63775 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1724,7 +1724,7 @@ public final class CraftServer implements Server {
@@ -83,7 +83,7 @@ index 1e8c4a85c..8315f6377 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 1e3aae3b8..95d13c146 100644
+index 1e3aae3b8f..95d13c146b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
diff --git a/Spigot-Server-Patches/0217-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0216-Avoid-NPE-in-PathfinderGoalTempt.patch
index 25b57a567b..2ff20c9150 100644
--- a/Spigot-Server-Patches/0217-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0216-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From 6aedfbae82f449bae1366f7c09bc1f46d2c68806 Mon Sep 17 00:00:00 2001
+From 2382c61af38c805ec9cf6f4bf795381df4b06734 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 5cf9b1896..1f3ae55a0 100644
+index 5cf9b18963..1f3ae55a00 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -52,7 +52,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
diff --git a/Spigot-Server-Patches/0218-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0217-PlayerPickupExperienceEvent.patch
index 1aa5849032..5a1218c3b1 100644
--- a/Spigot-Server-Patches/0218-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0217-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 371b2893fad6790037faf28546b8edf77b100716 Mon Sep 17 00:00:00 2001
+From 1eaf18a755a9c7c9559ed65af9bbbebe454cc588 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 404a222b4..4bcae2c21 100644
+index 404a222b45..4bcae2c21b 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -218,7 +218,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0219-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0218-ExperienceOrbMergeEvent.patch
index d64dd38c0d..542ec3a301 100644
--- a/Spigot-Server-Patches/0219-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0218-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From aee96001e75af09702f51549bc7336fdf72604e5 Mon Sep 17 00:00:00 2001
+From 48181f892f95ba0aee460a1eee9a7f2a256cf3e3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 228f4b28e..0c57b36c8 100644
+index 2985c76f37..c02619bb57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -404,7 +404,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0219-Ability-to-apply-mending-to-XP-API.patch
index 1bc2fd148e..178fdfeabe 100644
--- a/Spigot-Server-Patches/0220-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0219-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From ad0e9fc95bf0a33085cf12ea78bb21d16cdbd83d Mon Sep 17 00:00:00 2001
+From df166d912b5bec869afcc9174d8536446b786327 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 108ec49aa..72f0bec4e 100644
+index 108ec49aa5..72f0bec4e1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -242,6 +242,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 108ec49aa..72f0bec4e 100644
          List<ItemStack> list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4bcae2c21..09d85764b 100644
+index 4bcae2c21b..09d85764b0 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@@ -39,7 +39,7 @@ index 4bcae2c21..09d85764b 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dafc2948c..e6dadde80 100644
+index dafc2948c0..e6dadde80f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1026,8 +1026,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0220-Configurable-Chunks-Sends-per-Tick-setting.patch
index 5d35ff1c9c..69f2c6cf37 100644
--- a/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0220-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From 1c662af5a106fffa0514dbee6473f834da307c81 Mon Sep 17 00:00:00 2001
+From c687ba7547ccb45fff41f690dd9b7a66fc1d395e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,7 +8,7 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c9422d545..6a8b1c5e0 100644
+index c9422d545a..6a8b1c5e03 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -393,4 +393,13 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index c9422d545..6a8b1c5e0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e428d4485..f481e5a4f 100644
+index e428d4485b..f481e5a4ff 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -164,7 +164,7 @@ public class PlayerChunkMap {
diff --git a/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0221-Configurable-Max-Chunk-Gens-per-Tick.patch
index cce781986a..85188e3bea 100644
--- a/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0221-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From db6c0db5bbe084d6e31ee7d903da97ddb08896fe Mon Sep 17 00:00:00 2001
+From 9677c211f1a361076a780405a48c5aaad062f172 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,7 +13,7 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6a8b1c5e0..99d6ccc59 100644
+index 6a8b1c5e03..99d6ccc598 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -402,4 +402,15 @@ public class PaperWorldConfig {
@@ -33,7 +33,7 @@ index 6a8b1c5e0..99d6ccc59 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index b9d90c4fb..7d3f846a1 100644
+index b9d90c4fb8..7d3f846a19 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -21,6 +21,7 @@ public class PlayerChunk {
@@ -53,7 +53,7 @@ index b9d90c4fb..7d3f846a1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index f481e5a4f..679488a3c 100644
+index f481e5a4ff..679488a3cf 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -132,6 +132,7 @@ public class PlayerChunkMap {
@@ -77,7 +77,7 @@ index f481e5a4f..679488a3c 100644
                      if (playerchunk1.a(flag)) {
                          iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7ffb8f617..33d5fc7d5 100644
+index 7ffb8f6172..33d5fc7d5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -34,4 +34,10 @@ public class ChunkIOExecutor {
@@ -92,7 +92,7 @@ index 7ffb8f617..33d5fc7d5 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621c..cf1258c55 100644
+index 193c3621c6..cf1258c559 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 @@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
diff --git a/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0222-Make-max-squid-spawn-height-configurable.patch
index b947db5cc5..be3d9977ee 100644
--- a/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0222-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 73a422844a780dfbcdb5b04afc75721e55463611 Mon Sep 17 00:00:00 2001
+From aee359f56881e681adaeaf7b2efde9bb243d4d58 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 99d6ccc59..07a8ef697 100644
+index 99d6ccc598..07a8ef697f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -413,4 +413,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 99d6ccc59..07a8ef697 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 1a347bae3..b9c76325d 100644
+index 1a347bae37..b9c76325db 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0224-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0223-PreCreatureSpawnEvent.patch
index d2f02f1b10..da9bdd14f5 100644
--- a/Spigot-Server-Patches/0224-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0223-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 09c7a957235c78d328efac0b90a69a6f4c4749ce Mon Sep 17 00:00:00 2001
+From 4393dd1c81c81419675b7914dbd37b92a34352c0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 027ba7191..eca3f85ad 100644
+index 027ba71918..eca3f85ad2 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -1,6 +1,7 @@
@@ -56,7 +56,7 @@ index 027ba7191..eca3f85ad 100644
  
                      if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 2aa0db5c2..b57616960 100644
+index 2aa0db5c22..b57616960e 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -164,10 +164,30 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0225-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0224-PlayerNaturallySpawnCreaturesEvent.patch
index e0da037076..e23874f86b 100644
--- a/Spigot-Server-Patches/0225-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0224-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From cc85d73644b4dcfeae066be7202558d876062be0 Mon Sep 17 00:00:00 2001
+From 078b33cbd82794119f8708f500185e745e38c5ba Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index b57616960..e62616552 100644
+index b57616960e..e626165520 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -47,6 +47,15 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0226-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0225-Add-setPlayerProfile-API-for-Skulls.patch
index e4eaaff5a5..2cb4ac4a2c 100644
--- a/Spigot-Server-Patches/0226-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0225-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 38138854a7fc7b40af92b5cc810e42400b6ee380 Mon Sep 17 00:00:00 2001
+From 4391ebacd07855f754c975a03878cd52421ba6af Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 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 2ad3acf43..87e51cf8a 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;
diff --git a/Spigot-Server-Patches/0227-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0226-Fill-Profile-Property-Events.patch
index 384dbf1d8a..d2684ddb9f 100644
--- a/Spigot-Server-Patches/0227-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0226-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From b966e331f36e0c712453f48dfe5eb416300f26b4 Mon Sep 17 00:00:00 2001
+From e0ef1c07627248d2d678a1f2e78bd60b763dc9e6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423..61cfdf73c 100644
+index 4b2a67423f..61cfdf73c8 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0228-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0227-PlayerAdvancementCriterionGrantEvent.patch
index a052f71771..b032fa2e92 100644
--- a/Spigot-Server-Patches/0228-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0227-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From c8c50b83336ba0417338cbcb05d8c83eae6d31eb Mon Sep 17 00:00:00 2001
+From 94c0804a6d6ad37906d49bd91e7313a06729d90a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 519bccdad..c7ad71c5f 100644
+index 519bccdad0..c7ad71c5f3 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -228,6 +228,12 @@ public class AdvancementDataPlayer {
diff --git a/Spigot-Server-Patches/0229-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0228-Add-ArmorStand-Item-Meta.patch
index 209a546e23..6df74bf754 100644
--- a/Spigot-Server-Patches/0229-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0228-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 333352ba334991b9539be95219b489c566d95bd9 Mon Sep 17 00:00:00 2001
+From 3bc7ef8b18050eb0254ac54927d8e0c3bd2ccd20 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 eeb2c5689..69faeb9c0 100644
+index eeb2c5689e..69faeb9c09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -404,6 +404,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index eeb2c5689..69faeb9c0 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 2508cfcfa..570f695d8 100644
+index 2508cfcfa2..570f695d82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -156,6 +156,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -385,7 +385,7 @@ index 2508cfcfa..570f695d8 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 5a2de14fa5..d4f4508cce 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;
@@ -396,7 +396,7 @@ index 65b8123a8..0ad0004b9 100644
  import net.minecraft.server.Block;
  import net.minecraft.server.IRegistry;
  import net.minecraft.server.ITileEntity;
-@@ -315,7 +316,18 @@ public class ItemMetaTest extends AbstractTestingBase {
+@@ -339,7 +340,18 @@ public class ItemMetaTest extends AbstractTestingBase {
                      cleanStack.setItemMeta(meta);
                      return cleanStack;
                  }
diff --git a/Spigot-Server-Patches/0230-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0229-Extend-Player-Interact-cancellation.patch
index b2fbac7711..b2319cd6f6 100644
--- a/Spigot-Server-Patches/0230-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0229-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 41bead639a922980337b87325f23ee2db0b5fa82 Mon Sep 17 00:00:00 2001
+From b023a389347d6f1fdffb80d751e7b4cd82acc382 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 6ae6afa33..07f9b8d2f 100644
+index 6ae6afa339..07f9b8d2f7 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -111,6 +111,11 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0231-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0230-Tameable-getOwnerUniqueId-API.patch
index 4ad0524204..62add4a4e4 100644
--- a/Spigot-Server-Patches/0231-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0230-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 34f613b9751e7445b797b5bd3364226353ac00f8 Mon Sep 17 00:00:00 2001
+From 4493c2e352b6568517bae5413d36b6c8c06531c5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index e56bef334..cc9d432e7 100644
+index e56bef3340..cc9d432e7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index e56bef334..cc9d432e7 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index eaaebeab8..2e959321b 100644
+index eaaebeab83..2e959321b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
diff --git a/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0231-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 83502c86d6..1227509333 100644
--- a/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0231-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 901bf01a38e3a4292469669893dafed38c33e014 Mon Sep 17 00:00:00 2001
+From 0bef2f366cef39dcaf0a10707d705746496694b2 Mon Sep 17 00:00:00 2001
 From: MiniDigger <[email protected]>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 07a8ef697..f68b8a4b0 100644
+index 07a8ef697f..f68b8a4b05 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -191,6 +191,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 07a8ef697..f68b8a4b0 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 259f73f66..1640098c3 100644
+index 259f73f66e..1640098c35 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1029,6 +1029,7 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0233-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0232-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index 6612436221..1b6681125c 100644
--- a/Spigot-Server-Patches/0233-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0232-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From f5b9ff3b853ac33b56b9f3b8c758b377dc387b43 Mon Sep 17 00:00:00 2001
+From 85d587cafd70f53179e5748723089d875afe28c6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index ac81d3f86..f50bae012 100644
+index ac81d3f86b..f50bae0123 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
diff --git a/Spigot-Server-Patches/0234-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0233-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index b80fb3a814..78cefbbdd4 100644
--- a/Spigot-Server-Patches/0234-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0233-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,11 +1,11 @@
-From bdb3742482bd69726b0f0711ff32b127efd0b45f Mon Sep 17 00:00:00 2001
+From 4a099bffa3eb608b42cf27f5796a192910a17811 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 2c881be1e..2c4bbc789 100644
+index 2c881be1ed..2c4bbc7890 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -25,7 +25,8 @@ public class BlockIceFrost extends BlockIce {
diff --git a/Spigot-Server-Patches/0235-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0234-Disable-Explicit-Network-Manager-Flushing.patch
index 6a93f03bff..a4a936992a 100644
--- a/Spigot-Server-Patches/0235-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0234-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 184de510ade87607a3f9fdcb30fb2da3335fb8fe Mon Sep 17 00:00:00 2001
+From 1105176f71d6e381da53db34eb762f4b38fcf0b5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2ff2549d0..4a50aab51 100644
+index 2ff2549d0e..4a50aab512 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -65,6 +65,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0236-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0235-Implement-extended-PaperServerListPingEvent.patch
index d2a2d9e7f4..afc62b72f7 100644
--- a/Spigot-Server-Patches/0236-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0235-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 6af80d440e9fb1675a85122c6535be9121f54af3 Mon Sep 17 00:00:00 2001
+From 57a34945bc749450dd4d4d4c80ffca262cc59ee3 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..c1a8e295b
+index 0000000000..c1a8e295b6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 000000000..c1a8e295b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 000000000..a2a409e63
+index 0000000000..a2a409e635
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 000000000..a2a409e63
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..a85466bc7
+index 0000000000..a85466bc7e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5517c5fe8..476a729dd 100644
+index 5517c5fe81..476a729ddf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,7 @@
@@ -198,7 +198,7 @@ index 5517c5fe8..476a729dd 100644
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index c9edd289a..8aa121e2f 100644
+index c9edd289ac..8aa121e2f7 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -30,6 +30,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -221,7 +221,7 @@ index c9edd289a..8aa121e2f 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52d..ea52e89bd 100644
+index aa125a52dc..ea52e89bd9 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
@@ -246,7 +246,7 @@ index aa125a52d..ea52e89bd 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 56f135f24..9c442dee2 100644
+index 56f135f244..9c442dee24 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -290,7 +290,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0237-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0236-Improved-Async-Task-Scheduler.patch
index bd5bbf6897..4c672fcae8 100644
--- a/Spigot-Server-Patches/0237-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0236-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From 735f2ec6beacea16da0eb46c12d02f522cfc3c4a Mon Sep 17 00:00:00 2001
+From 4d4337136116ff55f4f1f7cc6af8234d7bcdd382 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 000000000..3c1992e21
+index 0000000000..3c1992e212
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 000000000..3c1992e21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 3ef79e3e9..3acfc0766 100644
+index 3ef79e3e94..3acfc07666 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -17,7 +17,6 @@ import java.util.function.Consumer;
diff --git a/Spigot-Server-Patches/0238-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0237-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 39269662b0..4cf0859035 100644
--- a/Spigot-Server-Patches/0238-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0237-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 09d0acccaf56907fd3d3948de70a40bd89560653 Mon Sep 17 00:00:00 2001
+From 86ea214e8c2c466d1c03fd9460031139d4747478 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 15c01333e..da5a7b3e9 100644
+index 15c01333e7..da5a7b3e92 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0239-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0238-Call-PortalCreateEvent-for-exit-portals.patch
index 5d89f76262..10ef931fd6 100644
--- a/Spigot-Server-Patches/0239-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0238-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,11 +1,11 @@
-From bdaa9d012700842538d78f99bbdcdbaf26688753 Mon Sep 17 00:00:00 2001
+From 37d51ffa6650f719bef1b2c76e3d612788df1d6f Mon Sep 17 00:00:00 2001
 From: MiniDigger <[email protected]>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index aca407142..a24bd02d5 100644
+index aca4071420..a24bd02d5b 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -48,6 +48,9 @@ public class PortalTravelAgent {
diff --git a/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0239-Player.setPlayerProfile-API.patch
index 8d757b7695..7e752192d8 100644
--- a/Spigot-Server-Patches/0240-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0239-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From e97e5e72de7f38b3261938e969c6c537a26ebf8a Mon Sep 17 00:00:00 2001
+From f4337f8ced9dcb58c32aec67ca2980286cdaa99c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1640098c3..7f29d1277 100644
+index 1640098c35..7f29d12771 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -63,7 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 1640098c3..7f29d1277 100644
      private final ItemCooldown ce;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index da5a7b3e9..c5801122d 100644
+index da5a7b3e92..c5801122dd 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index da5a7b3e9..c5801122d 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e6dadde80..66873e98f 100644
+index e6dadde80f..66873e98fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0241-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0240-Fix-Dragon-Server-Crashes.patch
index 562aef39f5..2a7a4f94e8 100644
--- a/Spigot-Server-Patches/0241-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0240-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From efd5c5166b40afc7c097133594bb0ad29b43dcb8 Mon Sep 17 00:00:00 2001
+From dae72772a85c9b8252ab9d61ad0996e5b53dd994 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 1180e7bc1..1906bcfc9 100644
+index 1180e7bc11..1906bcfc96 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -51,7 +51,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
diff --git a/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0241-getPlayerUniqueId-API.patch
index dea75a6012..a57db348d9 100644
--- a/Spigot-Server-Patches/0242-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0241-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From a040128d3a806e0073846e0849d1abf679ec4aef Mon Sep 17 00:00:00 2001
+From a15ff921d068b1fd91c7153fb56cf872852d38cf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ 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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8315f6377..268653acd 100644
+index 8315f63775..268653acd1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1417,6 +1417,26 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0243-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0242-Make-player-data-saving-configurable.patch
index c657f50d9e..2a1ef107d2 100644
--- a/Spigot-Server-Patches/0243-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0242-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From d58753f3ebf083c564382b1300d98339a9b1db78 Mon Sep 17 00:00:00 2001
+From 7400a595ae1c233ace959e015b466b112895ecd1 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 68c287026..3d924fd80 100644
+index 2b5dde6d99..b85cd10437 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -291,4 +291,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 68c287026..3d924fd80 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index c4173c0aa..d5e21cc33 100644
+index c4173c0aad..d5e21cc33c 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -141,6 +141,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0244-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0243-Make-legacy-ping-handler-more-reliable.patch
index 4dc6274bd1..a708699bc2 100644
--- a/Spigot-Server-Patches/0244-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0243-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From 469e2da778fca341cf8e258104fc6eb1e9a65fe6 Mon Sep 17 00:00:00 2001
+From 7c84ab3fa1f74dec63abd7d7af1163e1d98f2d73 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 204aa8229..2a99f34df 100644
+index 204aa82298..2a99f34df6 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
diff --git a/Spigot-Server-Patches/0245-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0244-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 862b300a5b..0b6cf63357 100644
--- a/Spigot-Server-Patches/0245-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0244-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From b3bd0e775606113e72dcfd82c4625bf7ce4c5362 Mon Sep 17 00:00:00 2001
+From 98fa17b2e410c24de48f86b9daaa28e549ceea1e Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 000000000..74c012fd4
+index 0000000000..74c012fd40
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 000000000..74c012fd4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 2a99f34df..2a30af7de 100644
+index 2a99f34df6..2a30af7def 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0245-Flag-to-disable-the-channel-limit.patch
index 3313fd484b..a87616392d 100644
--- a/Spigot-Server-Patches/0246-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0245-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 679c14d68a179fc09e6868d4cd9438d47daa6dff Mon Sep 17 00:00:00 2001
+From 2e2942bc159b5c614d5dc2b7cb28a3cc92c769a0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 66873e98f..62235efde 100644
+index 66873e98fe..62235efde9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -131,6 +131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0247-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0246-Add-method-to-open-already-placed-sign.patch
index e77f392174..dc0b2ed43b 100644
--- a/Spigot-Server-Patches/0247-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0246-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From 4d724d6d4fd700c9305718d7c6ffff06e7444a8c Mon Sep 17 00:00:00 2001
+From 72a83e45b01f592f4f0bed57cb341631b515b925 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index d5dbc4ca8..9b19dce9b 100644
+index d5dbc4ca81..9b19dce9bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -655,4 +655,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0248-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0247-Load-version-history-at-server-start.patch
index c5ee7aabe9..b8c436d876 100644
--- a/Spigot-Server-Patches/0248-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0247-Load-version-history-at-server-start.patch
@@ -1,11 +1,11 @@
-From b2b8830714ab48755af790bc49ace95f70f1ac8a Mon Sep 17 00:00:00 2001
+From 93b5a6f9f10f7e599af102f0c960f6d63d347ea3 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <[email protected]>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 0d2c7a6dc..437ac386a 100644
+index 0d2c7a6dc4..437ac386ac 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -212,6 +212,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0248-Configurable-sprint-interruption-on-attack.patch
index 5d541c0c0b..8eade164eb 100644
--- a/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0248-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 5d95bb06af5610d1e5d9c5bc549e8b928af7fcfa Mon Sep 17 00:00:00 2001
+From c618e7b5819a5514e61df2af06ec51351ebe8881 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f68b8a4b0..6fb76388e 100644
+index f68b8a4b05..6fb76388e9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -423,4 +423,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index f68b8a4b0..6fb76388e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7f29d1277..d4618d644 100644
+index 7f29d12771..d4618d644a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1081,7 +1081,11 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0250-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0249-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 7d0df8a717..c6e9a8f169 100644
--- a/Spigot-Server-Patches/0250-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0249-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From c1f825af2f4c12870a088a79779702d2056911c5 Mon Sep 17 00:00:00 2001
+From daadce88762d874da50c14fc9ed25c3b3037de45 Mon Sep 17 00:00:00 2001
 From: 0x22 <[email protected]>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 273385ee0..5ffb2cd34 100644
+index 2f00929f63..6dea9456a4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2464,7 +2464,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2465,7 +2465,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0251-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0250-EndermanEscapeEvent.patch
index f5dce47d3e..d188519c6c 100644
--- a/Spigot-Server-Patches/0251-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0250-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From fe971f1d83405580471c21f76c03dedbe9ba515e Mon Sep 17 00:00:00 2001
+From 5ca1ad1bd48d14028083ed5c8cbb8478a9f918df Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index d5d1be8b6..8949529e6 100644
+index d5d1be8b6b..8949529e67 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -1,6 +1,7 @@
diff --git a/Spigot-Server-Patches/0252-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0251-Enderman.teleportRandomly.patch
index a88e782bec..369f74a0b2 100644
--- a/Spigot-Server-Patches/0252-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0251-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 0f24704e5978af4e48331ad81d569ad2c376b660 Mon Sep 17 00:00:00 2001
+From d92790d85799f57bd6f30b8eed5589b289935287 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 8949529e6..233568cc1 100644
+index 8949529e67..233568cc12 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -176,6 +176,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index 8949529e6..233568cc1 100644
          double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
          double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index b81693d9f..9bc6a6c0c 100644
+index b81693d9ff..9bc6a6c0c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
diff --git a/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0252-Block-Enderpearl-Travel-Exploit.patch
index 05b71f1761..7acdcac26c 100644
--- a/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0252-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 1d29ffbf1178feefceda1ceda347ec0ef96c30c0 Mon Sep 17 00:00:00 2001
+From 4e03b9b37015ba08e1491234302e6662eb1e0b23 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6fb76388e..0a270b899 100644
+index 6fb76388e9..0a270b899d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -428,4 +428,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 6fb76388e..0a270b899 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index bab5b89fe..62b5b6ece 100644
+index bab5b89fe9..62b5b6ecea 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -242,6 +242,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0254-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0253-Expand-World.spawnParticle-API-and-add-Builder.patch
index e8ccaa9b06..e1dec22fc7 100644
--- a/Spigot-Server-Patches/0254-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0253-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From ab66716dc0b5e3805a0c0f4ed99ad9602148df1d Mon Sep 17 00:00:00 2001
+From 66592b7c943fac7d1ec21d536a47fcb6fa128dd8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ee09f4c5a..e4730352d 100644
+index ee09f4c5a0..e4730352d3 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1183,12 +1183,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -34,7 +34,7 @@ index ee09f4c5a..e4730352d 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 36d27c2a3..d06496762 100644
+index d72f393a75..1ed6e86855 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1761,11 +1761,17 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0255-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0254-EndermanAttackPlayerEvent.patch
index 4b080fc8c4..f281ca06a5 100644
--- a/Spigot-Server-Patches/0255-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0254-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From f16ebdf88533538730e5af25c7190e3d5682abf3 Mon Sep 17 00:00:00 2001
+From 33883f6d7a690c25a2c8a73bdf1de1ab9b6dcddd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 233568cc1..139a70ca3 100644
+index 233568cc12..139a70ca3b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -127,7 +127,15 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0256-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0255-WitchConsumePotionEvent.patch
index 5c83f87414..71638ec342 100644
--- a/Spigot-Server-Patches/0256-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0255-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From bf0fd9808cf4a71b63f0f3146854e135737671d2 Mon Sep 17 00:00:00 2001
+From 342abd56794abdc32b82160b0044e6cce4c67d61 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index eaae9ea9a..0d579c7e4 100644
+index eaae9ea9af..0d579c7e47 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -67,7 +67,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0257-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0256-WitchThrowPotionEvent.patch
index 4949c9a265..8e805d962c 100644
--- a/Spigot-Server-Patches/0257-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0256-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 553a1d5f3c85f0277530ba41dac7c5346947882b Mon Sep 17 00:00:00 2001
+From fa2f88446775c7b2cce37aef73802e12ed324c9f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 0d579c7e4..62f99fc3b 100644
+index 0d579c7e47..62f99fc3b7 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -154,7 +154,15 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0258-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0257-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 3891c5c07c..f5c89cb364 100644
--- a/Spigot-Server-Patches/0258-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0257-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From e8d18a60dd770cc4ad0669438ae552e892994b8b Mon Sep 17 00:00:00 2001
+From ee9295648e6b091a34abda3af8c24f48153c3253 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d06496762..a436ded60 100644
+index 1ed6e86855..1cc42edae8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1070,6 +1070,10 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch b/Spigot-Server-Patches/0258-Configurable-Villages-loading-chunks-for-door-checks.patch
index 16b8b87697..af47335922 100644
--- a/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
+++ b/Spigot-Server-Patches/0258-Configurable-Villages-loading-chunks-for-door-checks.patch
@@ -1,4 +1,4 @@
-From da606fe577aaf444fda2bfe33ae89a291e7bf999 Mon Sep 17 00:00:00 2001
+From 1648e767bbdfe53802b2c3a864c74cdaaca6909e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Villages loading chunks for door checks
 This avoids villages spam loading chunks sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0a270b899..4727ac6eb 100644
+index 0a270b899d..4727ac6eb5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -434,4 +434,12 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index 0a270b899..4727ac6eb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index 7a9fb9753..e40cd4186 100644
+index 7a9fb97530..e40cd41869 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
 @@ -136,7 +136,7 @@ public class PersistentVillage extends PersistentBase {
@@ -45,7 +45,7 @@ index 7a9fb9753..e40cd4186 100644
  
      public void a(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index b79457291..1363c53ff 100644
+index b794572915..1363c53ff0 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -11,10 +11,10 @@ import javax.annotation.Nullable;
@@ -99,7 +99,7 @@ index b79457291..1363c53ff 100644
  
          return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false;
 diff --git a/src/main/java/net/minecraft/server/VillageDoor.java b/src/main/java/net/minecraft/server/VillageDoor.java
-index 33ad5faa3..1edffc462 100644
+index 33ad5faa3e..1edffc4629 100644
 --- a/src/main/java/net/minecraft/server/VillageDoor.java
 +++ b/src/main/java/net/minecraft/server/VillageDoor.java
 @@ -55,6 +55,7 @@ public class VillageDoor {
diff --git a/Spigot-Server-Patches/0260-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0259-WitchReadyPotionEvent.patch
index 4f00d9b983..a568a32ad8 100644
--- a/Spigot-Server-Patches/0260-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0259-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From e691c3a54819fb82ea763ee65bc67736ce990965 Mon Sep 17 00:00:00 2001
+From d2c614b2a47fdc650f7d86e1f79969022c48d1eb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 62f99fc3b..feedfc9d9 100644
+index 62f99fc3b7..feedfc9d9c 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -100,7 +100,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0261-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0260-ItemStack-getMaxItemUseDuration.patch
index f791af9d8f..5692802ec5 100644
--- a/Spigot-Server-Patches/0261-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0260-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 97d696eb8fc7eaf1149bcdf0a955c01b250c5185 Mon Sep 17 00:00:00 2001
+From c386a2b894d68b0d9cc0cd0710b616de0585cf4b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 865ff2ee1..ba021bc40 100644
+index 927394333a..c1b6eb52bf 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -542,6 +542,7 @@ public final class ItemStack {
+@@ -548,6 +548,7 @@ public final class ItemStack {
          this.getItem().b(this, world, entityhuman);
      }
  
@@ -18,7 +18,7 @@ index 865ff2ee1..ba021bc40 100644
          return this.getItem().c(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 69faeb9c0..bc8fb2816 100644
+index 69faeb9c09..bc8fb28163 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -184,6 +184,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/Spigot-Server-Patches/0262-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0261-Implement-EntityTeleportEndGatewayEvent.patch
index 09c4885ee9..01198b16ae 100644
--- a/Spigot-Server-Patches/0262-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0261-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From 56676e418b82651d08584c7796dde227128c7859 Mon Sep 17 00:00:00 2001
+From c366ba96ccf88a22ec175dc58f4c31ec647be0c1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index d2b29ecbe..2af225021 100644
+index d2b29ecbe0..2af225021b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -138,8 +138,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0263-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0262-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index d50617f50c..e096a5b14b 100644
--- a/Spigot-Server-Patches/0263-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0262-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 5ad10a79ab1be9173465d09b1a35079f5152242f Mon Sep 17 00:00:00 2001
+From 9c180725949eeb8017beef9b50987cb1660c74f8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index b6af42904..a07337ae4 100644
+index b6af429044..a07337ae40 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0263-Properly-remove-entities-on-dimension-teleport.patch
index 3142106f53..6231cf6b35 100644
--- a/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0263-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From d6effb7b11bcebd1208e442c7e2da371ba3a6132 Mon Sep 17 00:00:00 2001
+From 8a4b7bff6950703ef13ea7ce72e80af4cee67d13 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,7 +22,7 @@ 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 1bb79a61e..97d21f65d 100644
+index 92a15ba947..debab1a715 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2611,7 +2611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 1bb79a61e..97d21f65d 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 e4730352d..c08ee62e8 100644
+index e4730352d3..c08ee62e84 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -997,6 +997,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0264-Fix-CraftEntity-hashCode.patch
index 08561b1daa..410a97e990 100644
--- a/Spigot-Server-Patches/0265-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0264-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 858d3e0aec628f0b54d8a3bece5ce35619d1b634 Mon Sep 17 00:00:00 2001
+From d83d55251a2b2bf4b9408f88226935e421c430f8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 84a58c7dc..a0e1a70d4 100644
+index 84a58c7dcd..a0e1a70d43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -558,14 +558,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0266-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0265-Configurable-Alternative-LootPool-Luck-Formula.patch
index e58d3ff8ab..b6a1b43f8f 100644
--- a/Spigot-Server-Patches/0266-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0265-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From 0153d967248e1a2b8ea247d88c9a52446197fa38 Mon Sep 17 00:00:00 2001
+From ca534128e22e65b35817572014741051107a190f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3d924fd80..361b3c9e9 100644
+index b85cd10437..d42853d14c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -300,4 +300,12 @@ public class PaperConfig {
@@ -53,7 +53,7 @@ index 3d924fd80..361b3c9e9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 3e313bba7..80f9f9a25 100644
+index 3e313bba7c..80f9f9a252 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -14,8 +14,8 @@ import java.util.Random;
diff --git a/Spigot-Server-Patches/0267-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0266-Print-Error-details-when-failing-to-save-player-data.patch
index b79d61a17d..2f2b77516a 100644
--- a/Spigot-Server-Patches/0267-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0266-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 0d831d5219f4f9ece92fce6eeabcf36870bc4cfd Mon Sep 17 00:00:00 2001
+From b19ec64b2b7728405a294db829c98d4c37b137da Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index d5e21cc33..577ba1b5f 100644
+index d5e21cc33c..577ba1b5f9 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -154,7 +154,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0267-Make-shield-blocking-delay-configurable.patch
index 4c26c21b03..35340f8e7d 100644
--- a/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0267-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 35cbb3436bb6a3ec07a2c81d4018491e1b6c3432 Mon Sep 17 00:00:00 2001
+From 43309180bebc7a1df2dd169fed98dd2f02737f59 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4727ac6eb..47f8dfcc4 100644
+index 4727ac6eb5..47f8dfcc41 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -442,4 +442,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 4727ac6eb..47f8dfcc4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 02fcfc449..deb50b84f 100644
+index 02fcfc449c..deb50b84f7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2701,7 +2701,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,7 +49,7 @@ index 02fcfc449..deb50b84f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2f96842bb..8e65bfc78 100644
+index 2f96842bb9..8e65bfc78e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -558,5 +558,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0269-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0268-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 98b7be5043..93c58e9619 100644
--- a/Spigot-Server-Patches/0269-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0268-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 4d741d79e00149f2ade3d413f34ddb333131b54b Mon Sep 17 00:00:00 2001
+From cc6a121371a695b0890a0a4a88221769e8f08e43 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
 This code was causing NPE's in saving player data, potentially related to reloads.
 
 diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
-index 5a21aed43..4d9f3d369 100644
+index 5a21aed438..4d9f3d3695 100644
 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
 +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
 @@ -78,6 +78,10 @@ public class RecipeBookServer extends RecipeBook {
diff --git a/Spigot-Server-Patches/0270-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0269-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 08f7faec62..99104085e1 100644
--- a/Spigot-Server-Patches/0270-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0269-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From d80a4b17e1c8d28526426a21fd09a901b298b40b Mon Sep 17 00:00:00 2001
+From 72ff41a6569670f3194ca52bf850eef0349b13a8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ 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 749a8a527..6e2ee04c7 100644
+index 749a8a5272..6e2ee04c77 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -152,7 +152,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index 749a8a527..6e2ee04c7 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 693411400..52bc68e6a 100644
+index 6934114005..52bc68e6a6 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -55,6 +55,7 @@ public class ItemBow extends Item {
@@ -59,7 +59,7 @@ index 693411400..52bc68e6a 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 0c57b36c8..e75c188b5 100644
+index c02619bb57..acc80d0684 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -332,7 +332,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0271-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0270-PlayerReadyArrowEvent.patch
index 8fdd6d08c8..02d1dbd627 100644
--- a/Spigot-Server-Patches/0271-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0270-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 17c90fda2396b574e67a8073b8e7c962e09f4cd6 Mon Sep 17 00:00:00 2001
+From 279fcab87ebe9244d2907f4554af9cd125dcb293 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ 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 52bc68e6a..f8dbc3c40 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,7 @@
diff --git a/Spigot-Server-Patches/0272-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0271-Fire-EntityShootBowEvent-for-Illusioner.patch
index 3a7ce01378..8d84f3f132 100644
--- a/Spigot-Server-Patches/0272-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0271-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From f34f47817491a0b6e37e1779964f96dd5cf83240 Mon Sep 17 00:00:00 2001
+From 534d093b17cb43c542e46b2efe94bbe4e8f7dfbd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 08af4453f..8b595979e 100644
+index 08af4453fa..8b595979e7 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -123,8 +123,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
diff --git a/Spigot-Server-Patches/0273-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0272-Implement-EntityKnockbackByEntityEvent.patch
index b7f5305ad5..933bba8605 100644
--- a/Spigot-Server-Patches/0273-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0272-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From fe425522ea63caa0bf747aeff4b7d92b27dd1506 Mon Sep 17 00:00:00 2001
+From b554c6c2f5953c364a8872108a0f6fd331225c31 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index deb50b84f..164e4b412 100644
+index deb50b84f7..164e4b412a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1251,6 +1251,12 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0274-Expand-Explosions-API.patch b/Spigot-Server-Patches/0273-Expand-Explosions-API.patch
index b3fe19df7f..8cd0245094 100644
--- a/Spigot-Server-Patches/0274-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0273-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 6df78c6dfa67a9a87e28b71732f6d6db344bb618 Mon Sep 17 00:00:00 2001
+From 440eeef40055f8f50ababeb0f190fba4bac3cd9c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a436ded60..35f8f93c6 100644
+index 1cc42edae8..cfa35740b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -539,6 +539,11 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0275-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0274-LivingEntity-Hand-Raised-Item-Use-API.patch
index 1ee619175b..4054c97daf 100644
--- a/Spigot-Server-Patches/0275-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0274-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 62cda842f8e05b1ba09d00b2b213f60364646754 Mon Sep 17 00:00:00 2001
+From b0ace26dda67fe67e597961dc025a8df70d902f6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 164e4b412..bc1ab273b 100644
+index 164e4b412a..bc1ab273bd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 164e4b412..bc1ab273b 100644
          return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8e65bfc78..52834b6da 100644
+index 8e65bfc78e..52834b6da3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -568,5 +568,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0276-RangedEntity-API.patch b/Spigot-Server-Patches/0275-RangedEntity-API.patch
index 7770f45809..8eeaa32915 100644
--- a/Spigot-Server-Patches/0276-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0275-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 3f0e1b8934a82c3b3c27364cec3c0c02dee03599 Mon Sep 17 00:00:00 2001
+From 4e5232bc88f4f7f5c7913f8cbd30e71973252d33 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
@@ -8,7 +8,7 @@ and to perform an attack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 new file mode 100644
-index 000000000..696660b08
+index 0000000000..696660b089
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 @@ -0,0 +1,19 @@
@@ -32,7 +32,7 @@ index 000000000..696660b08
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java
-index 4fd69850f..b763bd11d 100644
+index 4fd69850fd..b763bd11dd 100644
 --- a/src/main/java/net/minecraft/server/IRangedEntity.java
 +++ b/src/main/java/net/minecraft/server/IRangedEntity.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -46,7 +46,7 @@ index 4fd69850f..b763bd11d 100644
 +    void s(boolean flag); default void setChargingAttack(boolean flag) { s(flag); } // Paper - OBFHELPER
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-index 2ec1af8be..f31d3eed3 100644
+index 2ec1af8be4..f31d3eed3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 @@ -1,11 +1,12 @@
@@ -64,7 +64,7 @@ index 2ec1af8be..f31d3eed3 100644
      public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 23ab78da1..3f94c5a92 100644
+index 23ab78da15..3f94c5a920 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -1,5 +1,6 @@
@@ -84,7 +84,7 @@ index 23ab78da1..3f94c5a92 100644
      public CraftLlama(CraftServer server, EntityLlama entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index 4ed89615f..4fa5e84ea 100644
+index 4ed89615fd..4fa5e84ea4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 @@ -1,12 +1,13 @@
@@ -103,7 +103,7 @@ index 4ed89615f..4fa5e84ea 100644
      public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 0349f0a57..2e3d8fcdf 100644
+index 0349f0a574..2e3d8fcdfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -1,11 +1,12 @@
@@ -121,7 +121,7 @@ index 0349f0a57..2e3d8fcdf 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index c08833cb7..f25998eb6 100644
+index c08833cb7a..f25998eb6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,11 +1,12 @@
@@ -139,7 +139,7 @@ index c08833cb7..f25998eb6 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 3df0fcb9b..a1d04ff28 100644
+index 3df0fcb9b6..a1d04ff284 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0276-Add-config-to-disable-ender-dragon-legacy-check.patch
index 8970e98c0a..1abff66dcc 100644
--- a/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0276-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From d96e3ac5649e8899b83a08ec658fc1708086dff8 Mon Sep 17 00:00:00 2001
+From 0b1be3cdc11bb23eee5fe71b501121bafb812ddd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 47f8dfcc4..aa2be2ede 100644
+index 47f8dfcc41..aa2be2ede6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -447,4 +447,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 47f8dfcc4..aa2be2ede 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index a6259d9e6..aad7ce93f 100644
+index a6259d9e6c..aad7ce93f6 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -28,10 +28,10 @@ public class EnderDragonBattle {
diff --git a/Spigot-Server-Patches/0278-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0277-Implement-World.getEntity-UUID-API.patch
index 84d40cd819..2da495bd4c 100644
--- a/Spigot-Server-Patches/0278-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0277-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From 90c284c82dd7c3f2b4aebd9f0dadc35336335f5f Mon Sep 17 00:00:00 2001
+From f0ca58a8e0ebfb5e2e3b90874b70a7c01562a0fa Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 35f8f93c6..2fca59f8f 100644
+index cfa35740b4..609b911265 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -890,6 +890,14 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0278-InventoryCloseEvent-Reason-API.patch
index f91854a7f7..4ed9864073 100644
--- a/Spigot-Server-Patches/0279-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0278-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 5db8e75d6daadd431d60cfc697b54397eda03abe Mon Sep 17 00:00:00 2001
+From 1d495495333e3af2404bad9dc68d0b11ca1e0537 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -110,10 +110,10 @@ index e4e1d999e9..dc72538de6 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5ffb2cd346..a00b271b2f 100644
+index 6dea9456a4..0b5dc66897 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2000,7 +2000,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2001,7 +2001,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
diff --git a/Spigot-Server-Patches/0280-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0279-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 27265aaf68..885f49fd26 100644
--- a/Spigot-Server-Patches/0280-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0279-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 857c905119708c593c6cc1b805b45ab2a6b88bf1 Mon Sep 17 00:00:00 2001
+From bc5d4dcd27553b19ebbd6f37ba6281fc26c5f2be Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
diff --git a/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0280-Configurable-Bed-Search-Radius.patch
index 46df4fd7c3..015b2448c5 100644
--- a/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0280-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 57cdb70e3ec6a29015eb71a3f33734ca762d1357 Mon Sep 17 00:00:00 2001
+From f1cf963f3f14757f6fb2f07fe26fdd50e8201883 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index aa2be2ede..f5b2e88f3 100644
+index aa2be2ede6..f5b2e88f3b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -452,4 +452,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index aa2be2ede..f5b2e88f3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 06f627002..d81a2db6c 100644
+index 06f627002c..d81a2db6cd 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -187,6 +187,52 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0282-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0281-Vex-getSummoner-API.patch
index 5b52ec2eac..6571f56361 100644
--- a/Spigot-Server-Patches/0282-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0281-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From a89b899dbc110d276fc9e4e1e805f85e8a08db47 Mon Sep 17 00:00:00 2001
+From 21a3bb2c4364a30d0d8a1596884bbfe151c22e1f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the NPC that summoned this Vex
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index 388d34126..c3864b869 100644
+index 388d341262..c3864b869e 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -86,6 +86,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index 388d34126..c3864b869 100644
          return this.b;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 0f01fc591..c96a5df80 100644
+index 0f01fc591d..c96a5df80a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,8 +1,10 @@
diff --git a/Spigot-Server-Patches/0283-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0282-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index a39266cb2c..ac5b27f592 100644
--- a/Spigot-Server-Patches/0283-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0282-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 5f819f6f6d0720cbb42f542d5f16240b3bfd5ce3 Mon Sep 17 00:00:00 2001
+From 831e570a9d59d466810523e85b1fa31867af7cf2 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a00b271b2..9394d60d9 100644
+index 0b5dc66897..6d04c5733c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1915,6 +1915,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1916,6 +1916,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-Server-Patches/0284-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0283-Don-t-change-the-Entity-Random-seed-for-squids.patch
index de52d94b0d..39cc98409a 100644
--- a/Spigot-Server-Patches/0284-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0283-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From 1392b62b543545f39bd24d9bea933ab4c3223dd6 Mon Sep 17 00:00:00 2001
+From d4d2715633e038dca7705ed0ecbda6daff2dfae4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index b9c76325d..ab79317a2 100644
+index b9c76325db..ab79317a2d 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -22,7 +22,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0285-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0284-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 72b532df68..4f5ad6712b 100644
--- a/Spigot-Server-Patches/0285-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0284-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From c1163e0b159552622d66012f82923ef4a24c7b84 Mon Sep 17 00:00:00 2001
+From c0b99f356c30002ae8fb2536b5e0b78a7b8bfc4c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c08ee62e8..85a30652c 100644
+index c08ee62e84..85a30652c4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -963,7 +963,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0285-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index a09cd093fa..a52a446c32 100644
--- a/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0285-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From 11804fc6af089b140904ea3aaf81757aee10206b Mon Sep 17 00:00:00 2001
+From 349376a18c6a86ab6bb07513849d403ab6c71669 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 19 Jul 2018 01:23:00 -0400
 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
@@ -12,7 +12,7 @@ keep it vanilla in behavior
 a player may teleport away, and trigger instant despawn
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 98e214cdd..ee5078370 100644
+index 98e214cdd6..ee5078370c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -634,6 +634,8 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0287-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0286-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 5a6597c245..c7ef11d98f 100644
--- a/Spigot-Server-Patches/0287-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0286-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From cbcb5513c2dd25b08035877ac014282b934d84f0 Mon Sep 17 00:00:00 2001
+From 04e89bbfc9881b015778fc6e3916d3df9274d0bb Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 85f80741c..6752d0b8c 100644
+index e9986420c2..c9473087ad 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -173,6 +173,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0288-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0287-Use-asynchronous-Log4j-2-loggers.patch
index 6200ff4967..a9b66bef2c 100644
--- a/Spigot-Server-Patches/0288-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0287-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From f841f4e17ff60ac0f7bd13f9f0d79ae67dab8ec5 Mon Sep 17 00:00:00 2001
+From 82e41eb16264f724aa8745bc2ab2b2f0a50e94e8 Mon Sep 17 00:00:00 2001
 From: Minecrell <[email protected]>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 3ad5af346..9cbd4880f 100644
+index 3ad5af3463..9cbd4880f7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -24,7 +24,7 @@ index 3ad5af346..9cbd4880f 100644
              <artifactId>asm</artifactId>
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..ee7c90784
+index 0000000000..ee7c90784c
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
diff --git a/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0288-add-more-information-to-Entity.toString.patch
index fa7c4f0ba5..0d70d60c64 100644
--- a/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0288-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 8648a80864f6608a2b69bd1100de4f905e950a2b Mon Sep 17 00:00:00 2001
+From 2f51486373507742b96ba70777b50ad07388317c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ 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 97d21f65d..1f471888b 100644
+index debab1a715..69a058d830 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2514,7 +2514,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0290-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0289-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index fb75cecdbc..8223ee3d57 100644
--- a/Spigot-Server-Patches/0290-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0289-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From d10c53b639cee25522092b354621d0002f7e04e7 Mon Sep 17 00:00:00 2001
+From 0a837c25363d2b05d8a03aa1f80adf0502ca126c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8e7eedd09..58122bfcc 100644
+index 69a058d830..b6c46e01d9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 8e7eedd09..58122bfcc 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9befa890b..c3369dcf4 100644
+index c7712d2e71..1496125ddf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -110,6 +110,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -30,7 +30,7 @@ index 9befa890b..c3369dcf4 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 85a30652c..6d1f70b39 100644
+index 85a30652c4..6d1f70b39e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -51,6 +51,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0291-EnderDragon-Events.patch b/Spigot-Server-Patches/0290-EnderDragon-Events.patch
index c360266a31..83519962bb 100644
--- a/Spigot-Server-Patches/0291-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0290-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From fb3095a90265c6cb609b7f882dca74d07c4f3aee Mon Sep 17 00:00:00 2001
+From 807b6b37d1576b5cf82fb5c8a9423c69647fca98 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
 
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 1906bcfc9..50d291139 100644
+index 1906bcfc96..50d291139c 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -63,7 +63,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -27,7 +27,7 @@ index 1906bcfc9..50d291139 100644
          if (this.d != null) {
              this.d.die();
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index e74258676..141ba1e5e 100644
+index e742586765..141ba1e5e6 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -67,7 +67,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -41,7 +41,7 @@ index e74258676..141ba1e5e 100644
                          if (this.d != null) {
                              while (!this.d.b()) {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 7df8fd4d7..c0d66a023 100644
+index 7df8fd4d74..c0d66a0233 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -39,8 +39,10 @@ public class EntityDragonFireball extends EntityFireball {
diff --git a/Spigot-Server-Patches/0292-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0291-PlayerElytraBoostEvent.patch
index 0c699cbb1f..8e0a146018 100644
--- a/Spigot-Server-Patches/0292-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0291-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From b6251b63fcd15c228239af1b9cf2cea15c04f064 Mon Sep 17 00:00:00 2001
+From df3cc340d9321a3ffd4b9d60edce8159c44f749d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index dbb422e9d..13938775b 100644
+index dbb422e9da..13938775ba 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -33,9 +33,15 @@ public class ItemFireworks extends Item {
diff --git a/Spigot-Server-Patches/0293-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0292-PlayerLaunchProjectileEvent.patch
index 578d071637..a6c8c7c0d4 100644
--- a/Spigot-Server-Patches/0293-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0292-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 7da3a215fe926e8a27fc41e0e952cf72ad565873 Mon Sep 17 00:00:00 2001
+From a247cf802ea037f8e9df044e64fddc17ed3a43ef Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 18e8825c4..5f3926d83 100644
+index 18e8825c48..5f3926d830 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -9,16 +9,34 @@ public class ItemEgg extends Item {
@@ -45,7 +45,7 @@ index 18e8825c4..5f3926d83 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index 3672996c2..719210da1 100644
+index 3672996c2d..719210da15 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -14,7 +14,19 @@ public class ItemEnderPearl extends Item {
@@ -93,7 +93,7 @@ index 3672996c2..719210da1 100644
          entityhuman.b(StatisticList.ITEM_USED.b(this));
          return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index d26b42f71..23b06169e 100644
+index d26b42f710..23b06169e2 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -8,17 +8,34 @@ public class ItemExpBottle extends Item {
@@ -134,7 +134,7 @@ index d26b42f71..23b06169e 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index a74c803e7..8d882b81b 100644
+index a74c803e72..8d882b81bb 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -8,14 +8,38 @@ public class ItemLingeringPotion extends ItemPotion {
@@ -178,7 +178,7 @@ index a74c803e7..8d882b81b 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index d8879e084..95194ccdc 100644
+index d8879e0847..95194ccdc8 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -21,15 +21,23 @@ public class ItemSnowball extends Item {
@@ -211,7 +211,7 @@ index d8879e084..95194ccdc 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index 87e2825a8..2bddefb80 100644
+index 87e2825a84..2bddefb802 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -8,14 +8,38 @@ public class ItemSplashPotion extends ItemPotion {
diff --git a/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0293-Duplicate-UUID-Resolve-Option.patch
index 1fedb681e0..4f0936b949 100644
--- a/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0293-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 07a1a16b609fede1a55eef44e09bdb1f7c57e97d Mon Sep 17 00:00:00 2001
+From d4952e11a8163210b2a750f4c22b03b57a118632 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -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 f5b2e88f3..8c4ff1886 100644
+index f5b2e88f3b..8c4ff18868 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -463,4 +463,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index f5b2e88f3..8c4ff1886 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 c2f12f92b0..e8c06e01b4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -163,7 +163,7 @@ 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 ac9fca304..0d3aacf8d 100644
+index b6c46e01d9..6598b87eef 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2739,6 +2739,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -175,7 +175,7 @@ index ac9fca304..0d3aacf8d 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 c3369dcf4..eda3f10f2 100644
+index 1496125ddf..a5f4b9ad94 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 c3369dcf4..eda3f10f2 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 6d1f70b39..293818b19 100644
+index 6d1f70b39e..293818b196 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 {
diff --git a/Spigot-Server-Patches/0295-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0294-Speedup-BlockPos-by-fixing-inlining.patch
index e12b0c69c5..567c06abc5 100644
--- a/Spigot-Server-Patches/0295-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0294-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 53fd6438952f6854cea9a810e23949c9b027acc1 Mon Sep 17 00:00:00 2001
+From a37310c6dad755affd1bf6e87c34649cc598b732 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 4c7793f86..cc17a414f 100644
+index 4c7793f86d..cc17a414f5 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -80,7 +80,7 @@ index 4c7793f86..cc17a414f 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 80e13dfb2..20cf9255b 100644
+index 80e13dfb2e..20cf9255ba 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -202,18 +202,18 @@ public class BlockPosition extends BaseBlockPosition {
diff --git a/Spigot-Server-Patches/0296-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0295-Don-t-save-Proto-Chunks.patch
index 68f4c35962..190d00d477 100644
--- a/Spigot-Server-Patches/0296-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0295-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From 8144fe1c7fb428423df1a46a86e78c814e71ee8a Mon Sep 17 00:00:00 2001
+From 745f1a69fc7480310f06db300dd9b112b92ceb00 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 0fc4d9f52..2c4a4fc6b 100644
+index 0fc4d9f520..2c4a4fc6b7 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -304,6 +304,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -20,7 +20,7 @@ index 0fc4d9f52..2c4a4fc6b 100644
          world.checkSession();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 70a95c263..56958a5ce 100644
+index 70a95c2636..56958a5ce3 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -21,7 +21,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
diff --git a/Spigot-Server-Patches/0297-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0296-Optimize-RegistryID.c.patch
index 534816e002..f61f8d6d68 100644
--- a/Spigot-Server-Patches/0297-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0296-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From f94d8c12caa1814684ee30a6543c51d68d68d9fd Mon Sep 17 00:00:00 2001
+From 82c0f3c7cdd722722ee6bfd3047ecc52fab78026 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <[email protected]>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 5a5c464ea..37641fa86 100644
+index 5a5c464ea1..37641fa865 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
diff --git a/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0297-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 15a15f7ae6..e3dd2f193c 100644
--- a/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0297-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 81263e2380923daafbda6e6c6b923716099a7043 Mon Sep 17 00:00:00 2001
+From 6244aa55134ca674298f84bd72c07d62cc31a54d Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
diff --git a/Spigot-Server-Patches/0299-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0298-Vanished-players-don-t-have-rights.patch
index 5bbcb8f209..ba8f5fce15 100644
--- a/Spigot-Server-Patches/0299-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0298-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 18f41cfab72d71ce18a876d612fdce823ced970f Mon Sep 17 00:00:00 2001
+From 8230851068dc6fdb84a1ea3aa2f993f196bfc02c Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
diff --git a/Spigot-Server-Patches/0300-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0299-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index ff75897a3f..e7d6526a37 100644
--- a/Spigot-Server-Patches/0300-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0299-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 5db68f220944c579b43a082c9732005d4e2147f3 Mon Sep 17 00:00:00 2001
+From 1219243ef0beb650d17ea1073f32e1100a3102ed Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
diff --git a/Spigot-Server-Patches/0301-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0300-Add-some-Debug-to-Chunk-Entity-slices.patch
index 07912d2d4a..6b10943e4f 100644
--- a/Spigot-Server-Patches/0301-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0300-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 100f05b6d3e0b894381d9f32dbadabdc77a97d9d Mon Sep 17 00:00:00 2001
+From 9c6ef08691df7e3183ab14d8e9c709df4e71559a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
diff --git a/Spigot-Server-Patches/0302-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0301-Optimize-Region-File-Cache.patch
index ef6d13ae50..dd53bf2010 100644
--- a/Spigot-Server-Patches/0302-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0301-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From ef3479c926dcb3b18351f3d163558c9b1d86aa58 Mon Sep 17 00:00:00 2001
+From ea164536bfa0dfb4d6857ee576817bbc270be45f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 23 Jul 2018 23:40:04 -0400
 Subject: [PATCH] Optimize Region File Cache
@@ -32,7 +32,7 @@ synchronized context, reducing lock times.
 Ultimately: This brings us back to Vanilla, which has had no indication of region file loss.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 964996976..d07222239 100644
+index 964996976a..d072222390 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -99,7 +99,7 @@ public class RegionFileCache {
diff --git a/Spigot-Server-Patches/0303-EntityTransformedEvent.patch b/Spigot-Server-Patches/0302-EntityTransformedEvent.patch
index 01dceaf42c..057e7d2f6b 100644
--- a/Spigot-Server-Patches/0303-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0302-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From 9bc9364e7302259806103f562cccd56e0b88b9c4 Mon Sep 17 00:00:00 2001
+From 130c36491fe4a915582f5d62ef093f089f639e5c Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <[email protected]>
 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,7 +29,7 @@ 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 7a943a6c2..7998b80c1 100644
+index 7a943a6c27..7998b80c17 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -239,6 +239,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 7a943a6c2..7998b80c1 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 670e38eb8..359ac8b88 100644
+index 670e38eb8e..359ac8b88c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -140,6 +140,7 @@ public class EntityZombieVillager extends EntityZombie {
diff --git a/Spigot-Server-Patches/0304-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0303-SkeletonHorse-Additions.patch
index 44ee52fe87..fa883a8f25 100644
--- a/Spigot-Server-Patches/0304-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0303-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From b16b1b1a0902b9b983f4a1e629b05aba2f332572 Mon Sep 17 00:00:00 2001
+From a7467abe0696ee5861f5778e965678098b7189b2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 06f37f28a..eae2b2665 100644
+index 06f37f28af..eae2b26655 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 06f37f28a..eae2b2665 100644
          if (flag != this.bN) {
              this.bN = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index a6979fe85..d4fdcbdfd 100644
+index a6979fe859..d4fdcbdfd6 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index a6979fe85..d4fdcbdfd 100644
  
          this.a.s(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200..496d0c0ca 100644
+index e822c2200d..496d0c0cac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,23 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
diff --git a/Spigot-Server-Patches/0305-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0304-Prevent-Saving-Bad-entities-to-chunks.patch
index 54adada42e..4ae9540c74 100644
--- a/Spigot-Server-Patches/0305-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0304-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 176a6ae2aff482d22329cb39f9315603915f56ab Mon Sep 17 00:00:00 2001
+From b2792f793f14531836806df7b1c402bb9137a930 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2c4a4fc6b..485bce987 100644
+index 2c4a4fc6b7..485bce9872 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -567,11 +567,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0306-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0305-Don-t-call-getItemMeta-on-hasItemMeta.patch
index d804644b3c..f6fc02e648 100644
--- a/Spigot-Server-Patches/0306-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0305-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 97c3f604582d177fde7d6f05e32f7158ef9d3e3b Mon Sep 17 00:00:00 2001
+From 1357a61602da080e892436071b2f5171f3dc59ea Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <[email protected]>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index bc8fb2816..ca9399bdb 100644
+index bc8fb28163..ca9399bdbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -525,7 +525,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index bc8fb2816..ca9399bdb 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 0ad0004b9..7455461f1 100644
+index d4f4508cce..3a2793f322 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.*;
@@ -35,24 +35,25 @@ index 0ad0004b9..7455461f1 100644
  import java.util.List;
  import java.util.UUID;
  
-@@ -159,8 +160,47 @@ public class ItemMetaTest extends AbstractTestingBase {
-         ItemStack pureBukkit = new ItemStack(Material.SHEARS);
-         assertThat("Bukkit and craft stacks should be similar", craft.isSimilar(pureBukkit), is(true));
-         assertThat("Bukkit and craft stacks should be equal", craft.equals(pureBukkit), is(true));
+@@ -183,7 +184,47 @@ public class ItemMetaTest extends AbstractTestingBase {
+ 
+         assertThat("noTag and enchanted stacks should not be similar", noTag.isSimilar(enchanted), is(false));
+         assertThat("noTag and enchanted stacks should not be equal", noTag.equals(enchanted), is(false));
++
 +        // Paper start - test additional ItemMeta damage cases
-+        ItemStack clone = CraftItemStack.asBukkitCopy(CraftItemStack.asNMSCopy(craft));
-+        assertThat("Bukkit and craft stacks should be similar", craft.isSimilar(clone), is(true));
-+        assertThat("Bukkit and craft stacks should be equal", craft.equals(clone), is(true));
++        ItemStack clone = CraftItemStack.asBukkitCopy(CraftItemStack.asNMSCopy(noDamage));
++        assertThat("Bukkit and craft stacks should be similar", noDamage.isSimilar(clone), is(true));
++        assertThat("Bukkit and craft stacks should be equal", noDamage.equals(clone), is(true));
 +
-+        pureBukkit = new ItemStack(Material.DIAMOND_SWORD);
++        ItemStack pureBukkit = new ItemStack(Material.DIAMOND_SWORD);
 +        pureBukkit.setDurability((short) 2);
 +        net.minecraft.server.ItemStack nms = CraftItemStack.asNMSCopy(pureBukkit);
 +        ItemStack other = CraftItemStack.asBukkitCopy(nms);
 +
 +        assertThat("Bukkit and NMS ItemStack copies should be similar", pureBukkit.isSimilar(other), is(true));
 +        assertThat("Bukkit and NMS ItemStack copies should be equal", pureBukkit.equals(other), is(true));
-     }
- 
++    }
++
 +    private void testItemMeta(ItemStack stack) {
 +        assertThat("Should not have ItemMeta", stack.hasItemMeta(), is(false));
 +
@@ -77,12 +78,11 @@ index 0ad0004b9..7455461f1 100644
 +
 +        testItemMeta(itemStack);
 +        testItemMeta(CraftItemStack.asCraftCopy(itemStack));
-+    }
+     }
 +    // Paper end
-+
+ 
      @Test
      public void testBlockStateMeta() {
-         List<Block> queue = new ArrayList<>();
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0307-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0306-Always-process-chunk-removal-in-removeEntity.patch
index 4d560b1e7b..dc13c6bbc9 100644
--- a/Spigot-Server-Patches/0307-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0306-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From 057008b9c48ae55e921b3ee0014df76b4509118e Mon Sep 17 00:00:00 2001
+From f88a68c596f190756119dec505888c50d543fc1b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 28 Jul 2018 12:09:20 -0400
 Subject: [PATCH] Always process chunk removal in removeEntity
diff --git a/Spigot-Server-Patches/0308-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0307-Ignore-Dead-Entities-in-entityList-iteration.patch
index 3973ab3dd0..e89540120a 100644
--- a/Spigot-Server-Patches/0308-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0307-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 38b302a381c2e999cda2d6add7bf213adb295912 Mon Sep 17 00:00:00 2001
+From 9668175b9daf82f6d0646d0b3a3569a0ff38cfd9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
diff --git a/Spigot-Server-Patches/0309-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0308-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index dc84f6d6b3..1c9820c429 100644
--- a/Spigot-Server-Patches/0309-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0308-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 020f4fd5fbcf97767797623c6dd444fcae8b2d0e Mon Sep 17 00:00:00 2001
+From 2fab85ef228b9e7e1aafe1b04abd84ff634bbbda Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
 This is highly experiemental so backup your world before relying on this to not modify it
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 361b3c9e9..3538e80c3 100644
+index d42853d14c..63fdd94818 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -13,6 +13,7 @@ import java.util.List;
@@ -59,7 +59,7 @@ index 361b3c9e9..3538e80c3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 485bce987..60143ff63 100644
+index 485bce9872..60143ff63f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -58,8 +58,55 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -143,7 +143,7 @@ index 485bce987..60143ff63 100644
  
          if (nbttagcompound != null) {
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index d07222239..8c8b7cbab 100644
+index d072222390..8c8b7cbab5 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -76,6 +76,13 @@ public class RegionFileCache {
@@ -161,7 +161,7 @@ index d07222239..8c8b7cbab 100644
  
      public static synchronized void a() {
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 577ba1b5f..9be0e994e 100644
+index 577ba1b5f9..9be0e994ef 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -32,6 +32,58 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0310-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0309-MC-111480-Start-Entity-ID-s-at-1.patch
index 1f8be50070..1225584236 100644
--- a/Spigot-Server-Patches/0310-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0309-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From bfcb40bd0062ef2312c4beaaf20e4444ba7eed77 Mon Sep 17 00:00:00 2001
+From d68188e9997a3f9c1eac71c9bc79db8380475438 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 71ea64fe7..2d2edbd33 100644
+index cf69a4d8a4..4dc7c8ba68 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -90,7 +90,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0311-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0310-Implement-Expanded-ArmorStand-API.patch
index 3bbe3989b9..32d836531f 100644
--- a/Spigot-Server-Patches/0311-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0310-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 7c2071e930f61d44c3ec4addd1c31f0969da6ad0 Mon Sep 17 00:00:00 2001
+From 5c69091e158c9b2c6cdfc776af3e1594baac8978 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 694df9e18..c604182dd 100644
+index 694df9e185..c604182dd9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 694df9e18..c604182dd 100644
          return (this.bH & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185b..9f5c3b92e 100644
+index 124c3185bc..9f5c3b92e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0312-AnvilDamageEvent.patch b/Spigot-Server-Patches/0311-AnvilDamageEvent.patch
index 16fefedc17..c2e5acdfb1 100644
--- a/Spigot-Server-Patches/0312-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0311-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From f9787a408a77786c10c8632dad2ecac098e557d5 Mon Sep 17 00:00:00 2001
+From f3de9936f9b7986b89d7a91927a574c46fdc85f3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 1560dd382..d206e0465 100644
+index 1560dd382a..d206e04657 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -74,6 +74,16 @@ public class ContainerAnvil extends Container {
diff --git a/Spigot-Server-Patches/0313-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0312-World-EntityHuman-Lookup-Optimizations.patch
index cdb2f49fe7..796ed803a9 100644
--- a/Spigot-Server-Patches/0313-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0312-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,4 +1,4 @@
-From 28a9ac54731e4f544a428ad3e267f26d96370d4d Mon Sep 17 00:00:00 2001
+From df9635bc942ea00aedd136fdea9d06027e38b337 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Mon, 30 Jul 2018 02:42:49 -0400
 Subject: [PATCH] World EntityHuman Lookup Optimizations
diff --git a/Spigot-Server-Patches/0314-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0313-Add-TNTPrimeEvent.patch
index 4d1338e3b2..e4f323db8f 100644
--- a/Spigot-Server-Patches/0314-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0313-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From d10cf16f06181a2b2c05c7aac1569b065fb647d7 Mon Sep 17 00:00:00 2001
+From 3ef265b92bb3d54b656801642ceeba93feae998c Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 3f421d46a..0fbcd352c 100644
+index 3f421d46a0..0fbcd352c8 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -38,7 +38,7 @@ index 3f421d46a..0fbcd352c 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index f97fccf56..c821e6b3b 100644
+index f97fccf562..c821e6b3b9 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -112,7 +112,7 @@ index f97fccf56..c821e6b3b 100644
                  world.setAir(blockposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 79d8be8d4..fcc82d8eb 100644
+index 79d8be8d46..fcc82d8eb5 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0315-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0314-Break-up-and-make-tab-spam-limits-configurable.patch
index f19d65d2e3..96601a68b1 100644
--- a/Spigot-Server-Patches/0315-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0314-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 4eb1fe024505c41a58aedceadf435a00505610ed Mon Sep 17 00:00:00 2001
+From 72405ae2c700964a1c55d1dac670ce7346196459 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3538e80c3..975ebf75c 100644
+index 63fdd94818..642e704ed6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -332,4 +332,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 3538e80c3..975ebf75c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9394d60d9..a7b4439f0 100644
+index 6d04c5733c..9a96078004 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0316-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0315-Make-portal-teleportation-adjustment-math-more-accur.patch
index ddef0e0b00..d1e7db5abd 100644
--- a/Spigot-Server-Patches/0316-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0315-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,11 +1,11 @@
-From 4b2173326c910bed90cac49417bf04e35389fef6 Mon Sep 17 00:00:00 2001
+From e14ede8e0e2799cd730248905844cb35c42989e5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 31 Jul 2018 19:32:57 -0500
 Subject: [PATCH] Make portal teleportation adjustment math more accurate
 
 
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 13f0fb0b6..ce7181127 100644
+index 13f0fb0b67..ce71811271 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -82,6 +82,7 @@ public enum EnumDirection implements INamable {
@@ -33,7 +33,7 @@ index 13f0fb0b6..ce7181127 100644
              return this.c;
          }
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 52918b971..8bb2593aa 100644
+index 52918b971f..8bb2593aa9 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -81,6 +81,7 @@ public class MathHelper {
@@ -45,7 +45,7 @@ index 52918b971..8bb2593aa 100644
          return d0 < d1 ? d1 : (d0 > d2 ? d2 : d0);
      }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index a24bd02d5..d30a8a6bd 100644
+index a24bd02d5b..d30a8a6bdd 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -208,11 +208,27 @@ public class PortalTravelAgent {
@@ -79,7 +79,7 @@ index a24bd02d5..d30a8a6bd 100644
              float f1 = 0.0F;
              float f2 = 0.0F;
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index 8ba4da0ea..8716f5fd9 100644
+index 8ba4da0ea0..8716f5fd95 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -140,6 +140,7 @@ public class ShapeDetector {
diff --git a/Spigot-Server-Patches/0317-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0316-Add-hand-to-bucket-events.patch
index a96f7d1c47..59d5dc46f8 100644
--- a/Spigot-Server-Patches/0317-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0316-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From afd813d5fc75c545790b5fd56d8cb0a8c0468992 Mon Sep 17 00:00:00 2001
+From 23affd802a03fa9f0117265b7beaeee46350cf26 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5ac88166f..5874d2993 100644
+index 5ac88166fd..5874d2993c 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -65,7 +65,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 5ac88166f..5874d2993 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 6f5dda880..a064897fc 100644
+index 6f5dda880b..a064897fc4 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -35,7 +35,7 @@ public class ItemBucket extends Item {
@@ -67,7 +67,7 @@ index 6f5dda880..a064897fc 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1b13fa618..93da4c726 100644
+index 0a3a121cbc..e76862ef49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -234,6 +234,20 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0318-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0317-MC-135506-Experience-should-save-as-Integers.patch
index deebe75d9b..62305e03fe 100644
--- a/Spigot-Server-Patches/0318-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0317-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From d8949d63320b0811e3b341d4b3bf3d1147f2efef Mon Sep 17 00:00:00 2001
+From 5afad697dd515d28b733f5064b9d4a5ebbfc3307 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 09d85764b..3606b1014 100644
+index 09d85764b0..3606b10143 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -205,14 +205,14 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0319-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0318-Entity-add-to-world-fixes.patch
index bd20f0cefb..9b8db42564 100644
--- a/Spigot-Server-Patches/0319-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0318-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From f915d35b9a42d9b6f78a2eaf785a90339988fa75 Mon Sep 17 00:00:00 2001
+From caaa22ced1e3cc9e7c6c79192259a5436f1783e3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
diff --git a/Spigot-Server-Patches/0320-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0319-Fix-client-rendering-skulls-from-same-user.patch
index 4793a60e8f..8d9ccfb8b1 100644
--- a/Spigot-Server-Patches/0320-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0319-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From c51c553bbfcc0af8aa47d3da1d397636f883faaa Mon Sep 17 00:00:00 2001
+From 491d6c5a1e1cd26819ef555db2a1551c656a0a35 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ba021bc40..76e0f6417 100644
+index c1b6eb52bf..0420589faa 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -53,7 +53,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index ba021bc40..76e0f6417 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index d05f1e02c..b95836d44 100644
+index d05f1e02cf..b95836d443 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index d05f1e02c..b95836d44 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index f2159bc2d..18ef7232e 100644
+index f2159bc2dd..18ef7232ec 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -38,6 +38,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -83,7 +83,7 @@ index f2159bc2d..18ef7232e 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 79c24cdc4..6511bfda8 100644
+index 79c24cdc4c..6511bfda8d 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
diff --git a/Spigot-Server-Patches/0321-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0320-Add-Early-Warning-Feature-to-WatchDog.patch
index c4162cfc29..8a8a0fd900 100644
--- a/Spigot-Server-Patches/0321-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0320-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 667fcf79b5b3891c9cb350454630f949223e9b93 Mon Sep 17 00:00:00 2001
+From 5519ce709faf9753a90a4d9b62f1c3e4f4fbb6fd Mon Sep 17 00:00:00 2001
 From: miclebrick <[email protected]>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 975ebf75c..6bd59a886 100644
+index 642e704ed6..2023b5af0f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index 975ebf75c..6bd59a886 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 476a729dd..4565a56b3 100644
+index 476a729ddf..4565a56b3f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -792,6 +792,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -48,7 +48,7 @@ index 476a729dd..4565a56b3 100644
                  long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 95d51fb5b..81e27949d 100644
+index 268653acd1..d5ab1d11a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -752,6 +752,7 @@ public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index 95d51fb5b..81e27949d 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9c442dee2..fb09fb097 100644
+index 9c442dee24..fb09fb097d 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -225,7 +225,7 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index 9c442dee2..fb09fb097 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 0117c3d3d..5447bc9cc 100644
+index 0117c3d3de..5447bc9cc2 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
diff --git a/Spigot-Server-Patches/0322-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0321-Make-EnderDragon-implement-Mob.patch
index 42d76d0cfa..3168c6ffdc 100644
--- a/Spigot-Server-Patches/0322-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0321-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 3193f11d6ce6386788eeb087c60d36a80ee2ca84 Mon Sep 17 00:00:00 2001
+From d787919769890fd5e7fd0cef7e16c00cfd78de2c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc36..4947249da 100644
+index cc115cc368..4947249da2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,18 @@
diff --git a/Spigot-Server-Patches/0323-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0322-Detect-and-repair-corrupt-Region-Files.patch
index 97927b2821..a6ed81b198 100644
--- a/Spigot-Server-Patches/0323-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0322-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From fbb8d56a912bb3725a440d665a79ce9ec2af3dc0 Mon Sep 17 00:00:00 2001
+From 4c3edd05499f6111fd2b4feadc51ebb6a864be3d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files
@@ -11,7 +11,7 @@ I don't know why mojang only checks for 4096, when anything less than 8192 is a
 But to be safe, it will attempt to back up the file.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index e2d4450e9..c20511588 100644
+index e2d4450e90..c20511588d 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -25,10 +25,10 @@ public class RegionFile {
diff --git a/Spigot-Server-Patches/0324-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0323-Use-ConcurrentHashMap-in-JsonList.patch
index 0beac3e034..49fc96a1d9 100644
--- a/Spigot-Server-Patches/0324-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0323-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From b52072b894657cdc5b9820705e7ecddb1c335316 Mon Sep 17 00:00:00 2001
+From e6e3558e1e76d3194351c3d52e45be5e9dd36579 Mon Sep 17 00:00:00 2001
 From: egg82 <[email protected]>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 026ef7939..b7cde4d41 100644
+index 026ef7939e..b7cde4d418 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
diff --git a/Spigot-Server-Patches/0325-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0324-Use-a-Queue-for-Queueing-Commands.patch
index 1ddc5efc82..369409049c 100644
--- a/Spigot-Server-Patches/0325-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0324-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From f35d0221d6e2958f70a9c358a6318b0f6d83b5d3 Mon Sep 17 00:00:00 2001
+From 8ccec06d6eade3bb1d4189c09a4baa8d7e31ad37 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 437ac386a..21a05b2b2 100644
+index 437ac386ac..21a05b2b21 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0326-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0325-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 3d9476b5d4..29010bccd1 100644
--- a/Spigot-Server-Patches/0326-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0325-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From 1a56c638a04b91d269ab30d436c954e23c239ec2 Mon Sep 17 00:00:00 2001
+From e336d8b44c1619f25f813d824d8c465d3399b2ce Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index e65768499..9ba2fa5de 100644
+index e657684995..9ba2fa5de0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -99,7 +99,12 @@ public class CraftChunk implements Chunk {
diff --git a/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0326-Allow-disabling-armour-stand-ticking.patch
index 8b1896f993..baf6ec8c27 100644
--- a/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0326-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From 1042406ec858e20c2ed7e82e47fc94fc8b46587e Mon Sep 17 00:00:00 2001
+From 002645efa8e27923e6260c7b57956b4295567be9 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6c4cb61dc..0b60ca82c 100644
+index 6c4cb61dc5..0b60ca82ce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -507,4 +507,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 6c4cb61dc..0b60ca82c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index c604182dd..2c54e3e34 100644
+index c604182dd9..2c54e3e34a 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -45,6 +45,11 @@ public class EntityArmorStand extends EntityLiving {
@@ -141,7 +141,7 @@ index c604182dd..2c54e3e34 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bc1ab273b..cb32d64bd 100644
+index bc1ab273bd..cb32d64bd0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2083,52 +2083,7 @@ public abstract class EntityLiving extends Entity {
@@ -257,7 +257,7 @@ index bc1ab273b..cb32d64bd 100644
          float f2 = MathHelper.g(f - this.aQ);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92e..07ce93f17 100644
+index 9f5c3b92e3..07ce93f17c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0328-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0327-Optimize-BlockPosition-helper-methods.patch
index 9f16cbb6d5..63ba7de025 100644
--- a/Spigot-Server-Patches/0328-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0327-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 0056df40feab7ba6dce50706531a187db5fcd355 Mon Sep 17 00:00:00 2001
+From 8765ccb60e25a8512349974050b8c3450442d315 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 20cf9255b..5ce18f54c 100644
+index 20cf9255ba..5ce18f54c6 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -59,55 +59,72 @@ public class BlockPosition extends BaseBlockPosition {
diff --git a/Spigot-Server-Patches/0329-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0328-Send-nearby-packets-from-world-player-list-not-serve.patch
index 9abf13e253..13894d76e6 100644
--- a/Spigot-Server-Patches/0329-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0328-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From 3d84f674a2ca7d83d43d9aebb1df9661077f5d01 Mon Sep 17 00:00:00 2001
+From 90ad6938a623553a7766d7fc6338665b014ef3fd Mon Sep 17 00:00:00 2001
 From: Mystiflow <[email protected]>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ddaa73e83..ec760325b 100644
+index ddaa73e83d..ec760325ba 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1201,8 +1201,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index ddaa73e83..ec760325b 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index b4225b58e..0ba0eb661 100644
+index b4225b58ec..0ba0eb661b 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
 @@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@@ -95,7 +95,7 @@ index b4225b58e..0ba0eb661 100644
              if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                  double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4cda6cee2..0ff3fe03d 100644
+index 4cda6cee2b..0ff3fe03dd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1064,7 +1064,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,7 +119,7 @@ index 4cda6cee2..0ff3fe03d 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3fdd12ec0..e0b466d0c 100644
+index 4594bab465..72eb8ed4f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1636,7 +1636,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0330-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0329-Cache-World-Entity-Type-counts.patch
index 6577ba5b0a..b35722281f 100644
--- a/Spigot-Server-Patches/0330-Cache-World-Entity-Type-counts.patch
+++ b/Spigot-Server-Patches/0329-Cache-World-Entity-Type-counts.patch
@@ -1,4 +1,4 @@
-From 3aaff97c0e74b3463e51c4d1fa2a81b43fb099b2 Mon Sep 17 00:00:00 2001
+From ea48b312bc5e985bd2c1654d8494d235bcd632a4 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <[email protected]>
 Date: Wed, 8 Aug 2018 10:10:06 -0600
 Subject: [PATCH] Cache World Entity Type counts
diff --git a/Spigot-Server-Patches/0331-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0330-Restore-vanlla-default-mob-spawn-range.patch
index cdb9edcb6a..2c7c91aa67 100644
--- a/Spigot-Server-Patches/0331-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0330-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 88e23447dfbb01add6cf7be8fa22e643d7fbcd03 Mon Sep 17 00:00:00 2001
+From ae427b2baebf83d6d9cf14f9ba02c25920420b55 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1d222eaff..809ce1d6a 100644
+index 1d222eaff7..809ce1d6aa 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -136,7 +136,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0332-Optimize-Hoppers.patch b/Spigot-Server-Patches/0331-Optimize-Hoppers.patch
index f13a44c5dc..020436d527 100644
--- a/Spigot-Server-Patches/0332-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0331-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 058d9e7e33b9dbe4a5e2db58689e59e281d8b9c8 Mon Sep 17 00:00:00 2001
+From 299cee7fed5ab4af4ff1096312c690260696221f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0b60ca82c..e87fb94c0 100644
+index 0b60ca82ce..e87fb94c06 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -429,6 +429,15 @@ public class PaperWorldConfig {
@@ -31,10 +31,10 @@ index 0b60ca82c..e87fb94c0 100644
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 76e0f6417..f34ac392e 100644
+index 0420589faa..0d06db9355 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -479,8 +479,9 @@ public final class ItemStack {
+@@ -485,8 +485,9 @@ public final class ItemStack {
          return this.getItem().a(this, entityhuman, entityliving, enumhand);
      }
  
@@ -47,7 +47,7 @@ index 76e0f6417..f34ac392e 100644
          itemstack.d(this.B());
          if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4565a56b3..38c0201ac 100644
+index 4565a56b3f..38c0201acb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1048,6 +1048,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -59,7 +59,7 @@ index 4565a56b3..38c0201ac 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 29fe031d8..d67fd92d9 100644
+index 29fe031d85..d67fd92d9d 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -52,6 +52,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -79,7 +79,7 @@ index 29fe031d8..d67fd92d9 100644
              this.world.b(this.position, this);
              if (!this.f.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 559eedfa6..7303a6fdd 100644
+index 559eedfa66..7303a6fdda 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -189,6 +189,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
diff --git a/Spigot-Server-Patches/0333-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0332-Optimize-CraftBlockData-Creation.patch
index 733091d3fb..23e1fe5641 100644
--- a/Spigot-Server-Patches/0333-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0332-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 1e4052dcd847bbcde1fb82b45fc30f6a52c08cff Mon Sep 17 00:00:00 2001
+From 7f9d6eaeea4c3a7fd2d75d413016e01b7b2d30d8 Mon Sep 17 00:00:00 2001
 From: miclebrick <[email protected]>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/BlockData.java b/src/main/java/net/minecraft/server/BlockData.java
-index 4dd6c3276..1b226a77e 100644
+index 4dd6c32761..1b226a77e0 100644
 --- a/src/main/java/net/minecraft/server/BlockData.java
 +++ b/src/main/java/net/minecraft/server/BlockData.java
 @@ -1,6 +1,7 @@
@@ -34,7 +34,7 @@ index 4dd6c3276..1b226a77e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index e4e4c5513..08a5acb0a 100644
+index e4e4c55130..08a5acb0ac 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -27,6 +27,8 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
@@ -47,7 +47,7 @@ index e4e4c5513..08a5acb0a 100644
          return this.getBlock().n(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 7755e4f7a..4bb43e360 100644
+index 7755e4f7a6..4bb43e360d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -521,7 +521,17 @@ public class CraftBlockData implements BlockData {
diff --git a/Spigot-Server-Patches/0334-Fix-MC-124320.patch b/Spigot-Server-Patches/0333-Fix-MC-124320.patch
index 9e36dbe37c..9d70ce0562 100644
--- a/Spigot-Server-Patches/0334-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0333-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From cec81e81be74f02e67f7de151f545126fdb393a0 Mon Sep 17 00:00:00 2001
+From c31f3e86f6647a66fe4ab95da3ab06921900bd31 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index c674aa13d..2e460a7f6 100644
+index c674aa13d8..2e460a7f63 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -154,6 +154,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index c674aa13d..2e460a7f6 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 139a70ca3..e4aba0e0a 100644
+index 139a70ca3b..e4aba0e0a8 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -305,8 +305,9 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0335-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0334-Slime-Pathfinder-Events.patch
index b161303998..a965de351f 100644
--- a/Spigot-Server-Patches/0335-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0334-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From b77aad0930a6e3a9dee6e158b92bae4c144672dc Mon Sep 17 00:00:00 2001
+From fec723b8d5ee06df01c78f30e25beba1b4d7df2d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index f92bf02b8..81966542e 100644
+index f92bf02b87..81966542ee 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -1,6 +1,14 @@
@@ -145,7 +145,7 @@ index f92bf02b8..81966542e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index 18e7ef80a..8403c1e01 100644
+index 18e7ef80ac..8403c1e01c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -33,4 +33,14 @@ public class CraftSlime extends CraftMob implements Slime {
diff --git a/Spigot-Server-Patches/0336-Anti-Xray.patch b/Spigot-Server-Patches/0335-Anti-Xray.patch
index 261cfabada..ec56316cbf 100644
--- a/Spigot-Server-Patches/0336-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0335-Anti-Xray.patch
@@ -1,11 +1,11 @@
-From 5d077d44d4bbe2d4436cafe783621f53061000c8 Mon Sep 17 00:00:00 2001
+From b6acf5d97d05f6b9d8c544a1760eafd5643cc027 Mon Sep 17 00:00:00 2001
 From: stonar96 <[email protected]>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e87fb94c0..8f4926222 100644
+index e87fb94c06..8f49262226 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,10 @@
@@ -56,7 +56,7 @@ index e87fb94c0..8f4926222 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 000000000..1ba8477bf
+index 0000000000..1ba8477bf9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 @@ -0,0 +1,45 @@
@@ -107,7 +107,7 @@ index 000000000..1ba8477bf
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 000000000..e3da35b6b
+index 0000000000..e3da35b6ba
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -0,0 +1,684 @@
@@ -797,7 +797,7 @@ index 000000000..e3da35b6b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 new file mode 100644
-index 000000000..a68bace35
+index 0000000000..a68bace353
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 @@ -0,0 +1,81 @@
@@ -884,7 +884,7 @@ index 000000000..a68bace35
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 new file mode 100644
-index 000000000..e255a45fa
+index 0000000000..e255a45fa3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 @@ -0,0 +1,29 @@
@@ -919,7 +919,7 @@ index 000000000..e255a45fa
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 new file mode 100644
-index 000000000..cc586827a
+index 0000000000..cc586827aa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 @@ -0,0 +1,56 @@
@@ -981,7 +981,7 @@ index 000000000..cc586827a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 new file mode 100644
-index 000000000..37093419c
+index 0000000000..37093419cf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 @@ -0,0 +1,84 @@
@@ -1070,7 +1070,7 @@ index 000000000..37093419c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a915d0184..9f28d7775 100644
+index 4502ece4dd..4ae0acbf13 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -541,7 +541,7 @@ public class Chunk implements IChunkAccess {
@@ -1092,7 +1092,7 @@ index a915d0184..9f28d7775 100644
                  this.initLighting();
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 60143ff63..d938eb374 100644
+index 60143ff63f..d938eb3749 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -849,7 +849,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -1114,7 +1114,7 @@ index 60143ff63..d938eb374 100644
              chunksection.getBlocks().a(nbttagcompound, "Palette", "BlockStates");
              chunksection.a(new NibbleArray(nbttagcompound.getByteArray("BlockLight")));
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 621ed1fc5..2af07ae59 100644
+index 621ed1fc53..2af07ae592 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -11,9 +11,15 @@ public class ChunkSection {
@@ -1135,7 +1135,7 @@ index 621ed1fc5..2af07ae59 100644
          if (flag) {
              this.skyLight = new NibbleArray();
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 56958a5ce..d3898599f 100644
+index 56958a5ce3..d3898599f8 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -39,7 +39,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@@ -1157,7 +1157,7 @@ index 56958a5ce..d3898599f 100644
              }) : (Scheduler.a) this.progressCache.get(chunkcoordintpair.a());
          }
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 6fcfc5ef7..454903a0e 100644
+index 6fcfc5ef72..454903a0e7 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -1,5 +1,6 @@
@@ -1294,7 +1294,7 @@ index 6fcfc5ef7..454903a0e 100644
          int j = along.length * 64 / 4096;
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 4a50aab51..4c1110479 100644
+index 4a50aab512..4c1110479c 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -157,8 +157,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -1355,7 +1355,7 @@ index 4a50aab51..4c1110479 100644
      public void a() {
          this.o();
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 18ef7232e..8e35d14f9 100644
+index 18ef7232ec..8e35d14f97 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -1,5 +1,6 @@
@@ -1442,7 +1442,7 @@ index 18ef7232e..8e35d14f9 100644
                  if (flag) {
                      packetdataserializer.writeBytes(chunksection.getSkyLightArray().asBytes());
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 7d3f846a1..240f59066 100644
+index 7d3f846a19..240f590666 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -103,6 +103,8 @@ public class PlayerChunk {
@@ -1473,7 +1473,7 @@ index 7d3f846a1..240f59066 100644
                  } else {
                      this.a((Packet) (new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, this.chunk)));
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 07f9b8d2f..22378b6bc 100644
+index 07f9b8d2f7..22378b6bc8 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -207,6 +207,8 @@ public class PlayerInteractManager {
@@ -1486,7 +1486,7 @@ index 07f9b8d2f..22378b6bc 100644
  
      public void a(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 16e3469d0..e4c0cc6a3 100644
+index 16e3469d01..e4c0cc6a33 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -41,12 +41,24 @@ public class ProtoChunk implements IChunkAccess {
@@ -1534,7 +1534,7 @@ index 16e3469d0..e4c0cc6a3 100644
  
              if (enumskyblock == EnumSkyBlock.SKY) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c25c82bf1..1bd2167aa 100644
+index b007eb36c7..14f419deb8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,6 +1,8 @@
@@ -1571,7 +1571,7 @@ index c25c82bf1..1bd2167aa 100644
              if (iblockdata1 == null) {
                  // CraftBukkit start - remove blockstate if failed
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 791017258..29695da2e 100644
+index 791017258a..29695da2e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 @@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
diff --git a/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0336-Configurable-speed-for-water-flowing-over-lava.patch
index 36ac0364f1..f23154cad4 100644
--- a/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0336-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From 5f1c809fee84656d4c22041bffd48e4427081257 Mon Sep 17 00:00:00 2001
+From 4fef830e9621867bc3af8bac7fa822e12adfed59 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8f4926222..869bf8a9f 100644
+index 8f49262226..869bf8a9f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -481,6 +481,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 8f4926222..869bf8a9f 100644
          SAFE_REGEN, DELETE, NOTHING, WARN
      }
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index e67238582..b53a88c33 100644
+index e672385829..b53a88c33f 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -77,11 +77,27 @@ public class BlockFluids extends Block implements IFluidSource {
diff --git a/Spigot-Server-Patches/0338-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0337-Optimize-RegistryMaterials.patch
index aaaf977225..c405d399a9 100644
--- a/Spigot-Server-Patches/0338-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0337-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From ab8504873f6002be3e43c0c6b36317a6cfd5474a Mon Sep 17 00:00:00 2001
+From 6287458c83ada09b092886a8aa35534838222ed2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap
 BiMap.get was seen to be using a good bit of CPU time.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
-index 1521ed759..78de740ac 100644
+index 1521ed759b..78de740acf 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -15,9 +15,9 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0339-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0338-Add-PhantomPreSpawnEvent.patch
index e727948f70..fc4203da53 100644
--- a/Spigot-Server-Patches/0339-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0338-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From 6c1ef3d465fbd943aa636cabbec5b5504b0756b9 Mon Sep 17 00:00:00 2001
+From 30c304589394cbb4a62b90d363c0538f0a60ba75 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index a99d90efc..f576264a8 100644
+index a99d90efcb..f576264a8d 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -127,6 +127,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index a99d90efc..f576264a8 100644
  
          private int b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 5c43d908f..5ddf66eef 100644
+index 5c43d908f0..5ddf66eef5 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -50,8 +50,17 @@ public class MobSpawnerPhantom {
@@ -71,7 +71,7 @@ index 5c43d908f..5ddf66eef 100644
                                                  groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
                                                  world.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9f9ee9239..2b9731369 100644
+index 9f9ee92390..2b97313694 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
diff --git a/Spigot-Server-Patches/0340-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0339-Add-More-Creeper-API.patch
index e86ad13053..366efc5d4e 100644
--- a/Spigot-Server-Patches/0340-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0339-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 9827a1e538552fa814633570a07ba756dea05215 Mon Sep 17 00:00:00 2001
+From 90acbf1d243aaf1738d21101fb44075790373591 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index a07337ae4..945a75dd6 100644
+index a07337ae40..945a75dd62 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {
@@ -47,7 +47,7 @@ index a07337ae4..945a75dd6 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index ffebb54ca..ab2b20a0d 100644
+index ffebb54caa..ab2b20a0d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -76,4 +76,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
diff --git a/Spigot-Server-Patches/0341-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0340-Inventory-removeItemAnySlot.patch
index c18081e5da..0b5918815a 100644
--- a/Spigot-Server-Patches/0341-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0340-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From 55980265ea40b8dba6c5b37074398010f5b67999 Mon Sep 17 00:00:00 2001
+From f0993f00111e586cef6bd9a91f599b2c675b1a44 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index dd7b3d766..01af98293 100644
+index dd7b3d766f..01af982933 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -213,10 +213,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0342-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0341-Optimize-getChunkIfLoaded-type-calls.patch
index 70e3b07472..a0b48be77e 100644
--- a/Spigot-Server-Patches/0342-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0341-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From d624e34a3f181e39bc9d168204cf4f8052539f4a Mon Sep 17 00:00:00 2001
+From c630ddd10b4711ffcd5318829821fb44f48294df Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
diff --git a/Spigot-Server-Patches/0343-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0342-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 1a908568e5..63b8b198f4 100644
--- a/Spigot-Server-Patches/0343-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0342-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 1036aa02bdf179bb0ea4239432085c642d5f9519 Mon Sep 17 00:00:00 2001
+From b9a079faa51a82120065cb1726802785d95fd6c9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2c4465fff..95fe3a91b 100644
+index 7e52859c1d..0e4455d66e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -296,7 +296,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0344-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0343-Add-ray-tracing-methods-to-LivingEntity.patch
index 0b193b4797..d08d01e990 100644
--- a/Spigot-Server-Patches/0344-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0343-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From e0d5ee78d679bbe31ac7225c463063d798b1084d Mon Sep 17 00:00:00 2001
+From f7d0224d01343e319ec60cd0807c1f9e58bfe8ba Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index cb32d64bd..6367fdd46 100644
+index cb32d64bd0..6367fdd469 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2817,6 +2817,22 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index cb32d64bd..6367fdd46 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 52834b6da..eeab59379 100644
+index 52834b6da3..eeab59379a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -171,6 +171,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0344-Expose-attack-cooldown-methods-for-Player.patch
index 7dad973fa1..ef9bcdddfe 100644
--- a/Spigot-Server-Patches/0345-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0344-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 9c9a577ff54d9c95f6b6759b31da79273e864dee Mon Sep 17 00:00:00 2001
+From 4fbc83d8093f60433f29b804c3c352235627ab26 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cc1bc01b1..4bbf57752 100644
+index cc1bc01b16..4bbf577523 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2061,14 +2061,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index cc1bc01b1..4bbf57752 100644
          this.aH = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 47426d8fd..7a918ea72 100644
+index 47426d8fda..7a918ea72f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1897,6 +1897,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0346-Improve-death-events.patch b/Spigot-Server-Patches/0345-Improve-death-events.patch
index 214a0a1776..ddcd256635 100644
--- a/Spigot-Server-Patches/0346-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0345-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 3722b77d870c4a5be3f1bed43a26dd38653930a2 Mon Sep 17 00:00:00 2001
+From 31b199c08aabc3bac1268a37ab726e9905d67f3c Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index bbd5e2b2a..19750ceed 100644
+index bbd5e2b2a8..19750ceed1 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index bbd5e2b2a..19750ceed 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 4da34cf84..055fc6d89 100644
+index 90e0d9d453..c4d4775627 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1556,6 +1556,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 4da34cf84..055fc6d89 100644
          return SoundCategory.NEUTRAL;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 2c54e3e34..a5cc5e284 100644
+index 2c54e3e34a..a5cc5e2842 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -659,7 +659,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -69,7 +69,7 @@ index 2c54e3e34..a5cc5e284 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6367fdd46..3d1cdd627 100644
+index 6367fdd469..3d1cdd6271 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
@@ -206,7 +206,7 @@ index 6367fdd46..3d1cdd627 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index dc72538de..62feadc8a 100644
+index dc72538de6..62feadc8af 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -257,7 +257,7 @@ index dc72538de..62feadc8a 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 17fab031b..ee8219e3b 100644
+index 17fab031b4..ee8219e3ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -674,6 +674,22 @@ public enum CraftSound {
@@ -284,7 +284,7 @@ index 17fab031b..ee8219e3b 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 7a918ea72..8d32982c5 100644
+index 7a918ea72f..8d32982c53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1691,7 +1691,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -305,7 +305,7 @@ index 7a918ea72..8d32982c5 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 e76862ef4..68e30185a 100644
+index e76862ef49..68e30185a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -600,9 +600,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0347-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0346-Allow-chests-to-be-placed-with-NBT-data.patch
index e6593fe6fd..23bfda11c8 100644
--- a/Spigot-Server-Patches/0347-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0346-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From ebd98949f3593794792e66a108d3ad296b7c40be Mon Sep 17 00:00:00 2001
+From 9254fbc2091ff1c898ef32c4b788c22da56915c6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index f34ac392e1..eb130c0121 100644
+index 0d06db9355..f8d82a0276 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -241,6 +241,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0348-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0347-Mob-Pathfinding-API.patch
index 79b66c115d..9d531c641b 100644
--- a/Spigot-Server-Patches/0348-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0347-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 3501ae94e3889678406e8d15690cd905c859d788 Mon Sep 17 00:00:00 2001
+From f30d73d8b95844609afc163311777a5346232f34 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 000000000..ed3d86ddd
+index 0000000000..ed3d86ddd3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,113 @@
@@ -125,7 +125,7 @@ index 000000000..ed3d86ddd
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index c55aadb53..cac0ce2a3 100644
+index c55aadb536..cac0ce2a3a 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
@@ -173,7 +173,7 @@ index c55aadb53..cac0ce2a3 100644
          this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
          this.c = null;
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index 31fc1fbc6..5cf7f3bf1 100644
+index 31fc1fbc65..5cf7f3bf1b 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -212,7 +212,7 @@ index 31fc1fbc6..5cf7f3bf1 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index 78ed00286..0dd6e46d1 100644
+index 78ed002868..0dd6e46d12 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -229,7 +229,7 @@ index 78ed00286..0dd6e46d1 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06f..53c2d154e 100644
+index 5bf1cd06fa..53c2d154ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
diff --git a/Spigot-Server-Patches/0349-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0348-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 5b47b5bf0a..dc90ea6203 100644
--- a/Spigot-Server-Patches/0349-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0348-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From a6d0d3f88cd564ea13258eeb70929791801b6a63 Mon Sep 17 00:00:00 2001
+From 3d3c48d4ab5f4be23a1fb1e8803f8a233c3d7628 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 431602cac..c0955d6ec 100644
+index 431602cac1..c0955d6ec2 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -185,7 +185,8 @@ public abstract class FluidTypeFlowing extends FluidType {
diff --git a/Spigot-Server-Patches/0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0349-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index c518a1b80e..9ce0b023f4 100644
--- a/Spigot-Server-Patches/0350-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0349-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From 7586c4a617d2bfa2125e91fcd391fcefc9fd9d17 Mon Sep 17 00:00:00 2001
+From 4acfbb97ceafd3046c16fb8763ee1568daaf7abb Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/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 570f695d8..ec91ab72d 100644
+index 570f695d82..ec91ab72d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -82,6 +82,12 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0351-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0350-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 92957d03ba..58d51d1812 100644
--- a/Spigot-Server-Patches/0351-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0350-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From b9d64587ae8fa0d608b6d970b08368113e8f73aa Mon Sep 17 00:00:00 2001
+From f11bd89aabd642b356d2af32e10640a8569fef7d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 2b15aa6c9..3ca32123b 100644
+index 2b15aa6c9e..3ca32123bb 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -53,7 +53,7 @@ index 2b15aa6c9..3ca32123b 100644
          return block == this.f && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index e58fdee8b..f2c4048c2 100644
+index e58fdee8bb..f2c4048c2b 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -87,6 +87,7 @@ public class RandomPositionGenerator {
@@ -74,7 +74,7 @@ index e58fdee8b..f2c4048c2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d12e4763a..a7302b39c 100644
+index 630ebfb37c..0d45e21573 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -764,7 +764,17 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0352-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0351-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 95f86b97a7..240be86ab6 100644
--- a/Spigot-Server-Patches/0352-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0351-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 486bdf075eb79ddb255338c537871df4d7a2742a Mon Sep 17 00:00:00 2001
+From 25496ec74347f65858d1b02bf856dc89c3e44a65 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index bfbe4d3e39..17bb81c03e 100644
+index d125fae03b..297c53d15c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -129,9 +129,9 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0353-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0352-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3ff9ed0f6f..2fb6267de7 100644
--- a/Spigot-Server-Patches/0353-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0352-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 258bbb1d83dd2f662c4725e4520e722acf85b934 Mon Sep 17 00:00:00 2001
+From 38dcc25caf79d64c5fcb8cf6046cb7fe4cbd72a9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index c399bdecc..3496d4236 100644
+index c399bdecc3..3496d4236d 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -120,7 +120,7 @@ public abstract class BiomeBase {
diff --git a/Spigot-Server-Patches/0354-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0353-Optimize-and-Fix-ExpiringMap-Issues.patch
index 31564baad9..37366c73e7 100644
--- a/Spigot-Server-Patches/0354-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0353-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From 3f0a5b795917411e3c303f2ec75e620d37f6f1d5 Mon Sep 17 00:00:00 2001
+From c6ea2b8e4435461e2bfd287410e4a0845eb47720 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
@@ -14,7 +14,7 @@ manipulation, and instead to run clean
 once per tick per active expiring map.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
-index a23768441..835a2aae4 100644
+index a237684410..835a2aae40 100644
 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 @@ -142,13 +142,13 @@ public abstract class ChunkGeneratorAbstract<C extends GeneratorSettings> implem
@@ -34,7 +34,7 @@ index a23768441..835a2aae4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java
-index bd3636479..bf6095137 100644
+index bd36364796..bf6095137a 100644
 --- a/src/main/java/net/minecraft/server/ExpiringMap.java
 +++ b/src/main/java/net/minecraft/server/ExpiringMap.java
 @@ -2,87 +2,211 @@ package net.minecraft.server;
@@ -290,7 +290,7 @@ index bd3636479..bf6095137 100644
 +    */ // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 38c0201ac..ae271a57f 100644
+index 38c0201acb..ae271a57fc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -150,6 +150,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -310,7 +310,7 @@ index 38c0201ac..ae271a57f 100644
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 23f4e24ce..9e553866e 100644
+index 23f4e24cea..9e553866eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -159,7 +159,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
diff --git a/Spigot-Server-Patches/0355-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0354-Implement-furnace-cook-speed-multiplier-API.patch
index ab13b98469..a668ba26b7 100644
--- a/Spigot-Server-Patches/0355-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0354-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From e6278f7b1afddb39628b007f2f651679894c54e9 Mon Sep 17 00:00:00 2001
+From 30647dba5827f15f94d35d4cc67acd0cb71e367b Mon Sep 17 00:00:00 2001
 From: Tassu <[email protected]>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 5b6ccfa9f..bfbd35bbe 100644
+index 5b6ccfa9f5..bfbd35bbe5 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -9,6 +9,7 @@ import java.util.Map.Entry;
@@ -57,7 +57,7 @@ index 5b6ccfa9f..bfbd35bbe 100644
                          this.cookTimeTotal = this.s();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index c2eea8ce0..429c780ec 100644
+index c2eea8ce03..429c780ec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -84,4 +84,18 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F
diff --git a/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0355-Support-Overriding-World-Seeds.patch
index 968ba98cb3..0c609cc701 100644
--- a/Spigot-Server-Patches/0356-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0355-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 5e4a9fdd33c48b305e30babab70c19cf81c5cc89 Mon Sep 17 00:00:00 2001
+From 264373f74330d046b10469dbe24d45a0c3971da5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2023b5af0..07d7976d2 100644
+index 2023b5af0f..07d7976d21 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index 2023b5af0..07d7976d2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae271a57f..4543ac8f1 100644
+index ae271a57fc..4543ac8f15 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -345,7 +345,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -72,7 +72,7 @@ index ae271a57f..4543ac8f1 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 8458dc17d..b5fb95293 100644
+index 8458dc17d4..b5fb95293e 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -110,7 +110,7 @@ public class WorldData {
@@ -85,7 +85,7 @@ index 8458dc17d..b5fb95293 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d5ab1d11a..3cf303785 100644
+index d5ab1d11a2..3cf3037857 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -990,7 +990,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0357-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0356-Optimize-Server-World-Map.patch
index af3a0dc9c3..9b62be86f2 100644
--- a/Spigot-Server-Patches/0357-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0356-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From e50938d7b680aec6e1b487ace88c4d1351a38db5 Mon Sep 17 00:00:00 2001
+From 6c00757284ea40b18a629c0be9fa09042496f06d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 000000000..af9e4455c
+index 0000000000..af9e4455c6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 000000000..af9e4455c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4543ac8f1..d2ee4e578 100644
+index 4543ac8f15..d2ee4e5781 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -82,7 +82,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0358-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0357-PreSpawnerSpawnEvent.patch
index d240564c3c..ee6783f597 100644
--- a/Spigot-Server-Patches/0358-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0357-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 6510bcdfe343936432ec730caa99f9bc4029cea6 Mon Sep 17 00:00:00 2001
+From 27d86dafa2b1b6763d579bfcb34efef889ffa7ec Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index eca3f85ad..b2d2de7f8 100644
+index eca3f85ad2..b2d2de7f81 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -102,11 +102,11 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0358-Catch-JsonParseException-in-Entity-and-TE-names.patch
index ff8109a07f..db0f81a76a 100644
--- a/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0358-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 5d94befd25ec2d72c8045bb9bcd070fe6beb667f Mon Sep 17 00:00:00 2001
+From b44e80368f30993e543b9cd43097a5a41118e16f Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -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,7 +26,7 @@ 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 055fc6d89..5ea556995 100644
+index c4d4775627..3d90fdb642 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1745,7 +1745,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 055fc6d89..5ea556995 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
diff --git a/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0359-Avoid-dimension-id-collisions.patch
index 0817f0e30b..a852f5d662 100644
--- a/Spigot-Server-Patches/0360-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0359-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 497abc68440564a2d7e9758183bcc06c55845125 Mon Sep 17 00:00:00 2001
+From 1b850b4cb89a77373fab8799934e2371a22d3dc0 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3cf303785..d4d8fbb55 100644
+index 3cf3037857..d4d8fbb556 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -976,7 +976,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0361-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch
index 916fc08048..580690ca5f 100644
--- a/Spigot-Server-Patches/0361-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0360-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From dcf95f62ae968eeb17aa06bfea3e4cb0842d4178 Mon Sep 17 00:00:00 2001
+From 4e97187ddd0422e3eaaea5715cae3db866f7c0f6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 2af1ac702..aa54e380e 100644
+index 2af1ac7028..aa54e380e4 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0361-Async-Chunk-Loading-and-Generation.patch
index d83292394c..494a0dd328 100644
--- a/Spigot-Server-Patches/0362-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0361-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From 43d96e4be29752e4c7f7d11df974daa7bd2a5a4b Mon Sep 17 00:00:00 2001
+From 3e8f931198ca4a9877415012df19ec4efc8c54b1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 07d7976d2..c25db284f 100644
+index 07d7976d21..c25db284ff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -376,4 +376,57 @@ public class PaperConfig {
@@ -106,7 +106,7 @@ index 07d7976d2..c25db284f 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 new file mode 100644
-index 000000000..8f18c2869
+index 0000000000..8f18c28695
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 @@ -0,0 +1,347 @@
@@ -458,7 +458,7 @@ index 000000000..8f18c2869
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4ae0acbf1..4f64072a7 100644
+index 4ae0acbf13..4f64072a7b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -190,6 +190,7 @@ public class Chunk implements IChunkAccess {
@@ -470,7 +470,7 @@ index 4ae0acbf1..4f64072a7 100644
  
          Iterator iterator = protochunk.s().iterator();
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 2021c0d02..154ab09e0 100644
+index 2021c0d02e..154ab09e0c 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -562,7 +562,7 @@ index 2021c0d02..154ab09e0 100644
  
      public void putAll(Map<? extends Long, ? extends Chunk> map) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 186cfda7e..781e06877 100644
+index 186cfda7e4..781e068770 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -33,12 +33,12 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -713,7 +713,7 @@ index 186cfda7e..781e06877 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d938eb374..7734712af 100644
+index d938eb3749..7734712af9 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -119,7 +119,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -755,7 +755,7 @@ index d938eb374..7734712af 100644
                  completion = new Supplier<NBTTagCompound>() {
                      public NBTTagCompound get() {
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 2af07ae59..9c6844d44 100644
+index 2af07ae592..9c6844d441 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -25,7 +25,17 @@ public class ChunkSection {
@@ -777,7 +777,7 @@ index 2af07ae59..9c6844d44 100644
      public IBlockData getType(int i, int j, int k) {
          return (IBlockData) this.blockIds.a(i, j, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index d3898599f..8f061f5ca 100644
+index d3898599f8..8f061f5ca3 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -17,13 +17,14 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@@ -848,7 +848,7 @@ index d3898599f..8f061f5ca 100644
  
      protected ProtoChunk a(ChunkCoordIntPair chunkcoordintpair, ChunkStatus chunkstatus, Map<ChunkCoordIntPair, ProtoChunk> map) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 454903a0e..dcbcb655c 100644
+index 454903a0e7..dcbcb655c5 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
@@ -936,7 +936,7 @@ index 454903a0e..dcbcb655c 100644
  
      // Paper start - Anti-Xray - Support default methods
 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index f5a6387f2..f45685099 100644
+index f5a6387f27..f456850997 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
 @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
@@ -949,7 +949,7 @@ index f5a6387f2..f45685099 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3d90fdb64..d6d0dd6d8 100644
+index 3d90fdb642..d6d0dd6d88 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -207,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -962,7 +962,7 @@ index 3d90fdb64..d6d0dd6d8 100644
          this.aJ = Sets.newHashSet();
          this.aL = new double[] { 0.0D, 0.0D, 0.0D};
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 4698ee99f..431f4ab18 100644
+index 4698ee99f8..431f4ab189 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -6,6 +6,9 @@ import javax.annotation.Nullable;
@@ -976,7 +976,7 @@ index 4698ee99f..431f4ab18 100644
      Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
  
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 8bb2593aa..67bb28954 100644
+index 8bb2593aa9..67bb289545 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@@ -997,7 +997,7 @@ index 8bb2593aa..67bb28954 100644
          f %= 360.0F;
          if (f >= 180.0F) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d2ee4e578..236fbafeb 100644
+index d2ee4e5781..236fbafeb5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -499,6 +499,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1087,7 +1087,7 @@ index d2ee4e578..236fbafeb 100644
              i = SystemUtils.getMonotonicNanos();
 diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 new file mode 100644
-index 000000000..851756d65
+index 0000000000..851756d65e
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 @@ -0,0 +1,658 @@
@@ -1750,7 +1750,7 @@ index 000000000..851756d65
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 240f59066..e4cf8548d 100644
+index 240f590666..e4cf8548d3 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -22,6 +22,52 @@ public class PlayerChunk {
@@ -1848,7 +1848,7 @@ index 240f59066..e4cf8548d 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 679488a3c..b7dda8e28 100644
+index 679488a3cf..b7dda8e282 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -25,10 +25,10 @@ public class PlayerChunkMap {
@@ -1908,7 +1908,7 @@ index 679488a3c..b7dda8e28 100644
  
      private void e() {
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index de6dd4fed..da6df06d8 100644
+index de6dd4fed7..da6df06d84 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 @@ -34,7 +34,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@@ -1921,7 +1921,7 @@ index de6dd4fed..da6df06d8 100644
          this.m = world.getChunkProvider().getChunkGenerator().getSettings();
          this.i = world.getSeaLevel();
 diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java
-index 8e909d9ca..f214a74a2 100644
+index 8e909d9caf..f214a74a29 100644
 --- a/src/main/java/net/minecraft/server/SchedulerBatch.java
 +++ b/src/main/java/net/minecraft/server/SchedulerBatch.java
 @@ -10,6 +10,7 @@ public class SchedulerBatch<K, T extends SchedulerTask<K, T>, R> {
@@ -1976,7 +1976,7 @@ index 8e909d9ca..f214a74a2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index d9def7135..945a005e9 100644
+index d9def71353..945a005e90 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
 @@ -16,7 +16,7 @@ public abstract class StructurePiece {
@@ -2011,7 +2011,7 @@ index d9def7135..945a005e9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index 284e96710..8b08efe1f 100644
+index 284e96710a..8b08efe1f4 100644
 --- a/src/main/java/net/minecraft/server/StructureStart.java
 +++ b/src/main/java/net/minecraft/server/StructureStart.java
 @@ -7,7 +7,7 @@ import java.util.Random;
@@ -2072,7 +2072,7 @@ index 284e96710..8b08efe1f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0d45e2157..97a0fbd55 100644
+index 0d45e21573..97a0fbd55c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -41,7 +41,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2169,7 +2169,7 @@ index 0d45e2157..97a0fbd55 100644
          if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
          if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index 69d8a25bd..d0eaa9e9f 100644
+index 69d8a25bdf..d0eaa9e9f8 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -10,23 +10,28 @@ import javax.annotation.Nullable;
@@ -2322,7 +2322,7 @@ index 69d8a25bd..d0eaa9e9f 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0ff3fe03d..e71a40580 100644
+index 0ff3fe03dd..e71a405807 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -80,6 +80,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -2343,7 +2343,7 @@ index 0ff3fe03d..e71a40580 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d4d8fbb55..af065bd70 100644
+index d4d8fbb556..af065bd705 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1022,8 +1022,12 @@ public final class CraftServer implements Server {
@@ -2371,7 +2371,7 @@ index d4d8fbb55..af065bd70 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0e4455d66..eacecccfd 100644
+index 0e4455d66e..eacecccfdb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -163,6 +163,16 @@ public class CraftWorld implements World {
@@ -2409,7 +2409,7 @@ index 0e4455d66..eacecccfd 100644
                      if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
                          unloadChunk(chunkCoordX + x, chunkCoordZ + z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 68e30185a..7905420ca 100644
+index 68e30185a2..7905420cac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -82,6 +82,7 @@ public class CraftEventFactory {
@@ -2471,7 +2471,7 @@ index 68e30185a..7905420ca 100644
  
          if (!event.isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 9e553866e..04c0adf7c 100644
+index 9e553866eb..04c0adf7c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
diff --git a/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0362-Ignore-Dimension-NBT-field-in-Entity-data.patch
index 7278755adf..3acfc8c5fe 100644
--- a/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0362-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From 60c7b76985ed6b530dd14c5c4b78183ee8562abf Mon Sep 17 00:00:00 2001
+From 504acd5b82a2ade2f382e890d31ee27efb22aee4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,7 +14,7 @@ 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 b0af43362..9e8bd174e 100644
+index d6d0dd6d88..3db1b6bb1b 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
diff --git a/Spigot-Server-Patches/0364-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0363-Optimize-Light-Recalculations.patch
index e9b68a7dbc..6f1019924d 100644
--- a/Spigot-Server-Patches/0364-Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/0363-Optimize-Light-Recalculations.patch
@@ -1,4 +1,4 @@
-From 722c4b837cfcb6db6ac546e4d3952b9552d7a56d Mon Sep 17 00:00:00 2001
+From 68d53d355f81300b2cbd41c12ef16efe87a3d8fb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 28 Sep 2018 20:46:29 -0400
 Subject: [PATCH] Optimize Light Recalculations
diff --git a/Spigot-Server-Patches/0365-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0364-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 0e373dbabd..7c76dcc94a 100644
--- a/Spigot-Server-Patches/0365-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0364-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 3c966ef69587e91e36e7b83cc8d175ae73c91dfb Mon Sep 17 00:00:00 2001
+From 54fce61ce9cd7da50f7fa8d635f7364ee724b6d8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
diff --git a/Spigot-Server-Patches/0366-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch
index 05ff2f6ff7..14f98e46f2 100644
--- a/Spigot-Server-Patches/0366-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From 8a5e07c9519d35e5ac82330c9d68f08b40f569c3 Mon Sep 17 00:00:00 2001
+From 5c7269fbecfab55d9d9aaae09ccd13df67fad70b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
@@ -16,7 +16,7 @@ be having data corruption issues anyways.
 This provides a small boost to all setType calls.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index fdf062b8b..d848a97bd 100644
+index 966879a894..0d51c1baeb 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -558,7 +558,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0367-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch
index cfcd604aba..014bdbd6b6 100644
--- a/Spigot-Server-Patches/0367-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch
@@ -1,4 +1,4 @@
-From 8484a08f0e21ca3e231e2c2fa45de1ebeddc7f80 Mon Sep 17 00:00:00 2001
+From 07a00d527e871eadaf4a96af5ad367ddcbfa9cc3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
diff --git a/Spigot-Server-Patches/0368-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch
index 93238dad9b..183f428daf 100644
--- a/Spigot-Server-Patches/0368-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From 74dc5cf3e80d9f99293f89c4273358f65f755549 Mon Sep 17 00:00:00 2001
+From 2b373c407f22a8b2ecfd5fc3a9faa9f94546383c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 942520088..7f9845d92 100644
+index c25db284ff..e4972e30ce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -296,6 +296,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 942520088..7f9845d92 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index e732d55f9..2c594b437 100644
+index e732d55f9f..2c594b4378 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -37,7 +37,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0369-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch
index adfa84c73f..f8d48599a9 100644
--- a/Spigot-Server-Patches/0369-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From a3fbb3c9303e070a1a4110b2bcacfb69e5562054 Mon Sep 17 00:00:00 2001
+From 4e5812633b869d071215da93dc3cffd797de9951 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
@@ -9,7 +9,7 @@ issues when this counter is updated from multiple threads, potentially
 causing these counters to desync due to the unsafe volatile update
 
 diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
-index 3c688f546..570624600 100644
+index 3c688f546c..570624600d 100644
 --- a/src/main/java/net/minecraft/server/FileIOThread.java
 +++ b/src/main/java/net/minecraft/server/FileIOThread.java
 @@ -10,7 +10,7 @@ public class FileIOThread implements Runnable {
diff --git a/Spigot-Server-Patches/0370-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch
index dab971a086..efeca52c5c 100644
--- a/Spigot-Server-Patches/0370-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From b99974a67eb570f26dab20309617378f7450c89a Mon Sep 17 00:00:00 2001
+From 82c714ff2ed5dc92a29901636c8dbf590f4a68ba Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 632df2270..b66323220 100644
+index 632df2270c..b663232201 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
diff --git a/Spigot-Server-Patches/0371-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch
index 75e0848fae..51015c18f8 100644
--- a/Spigot-Server-Patches/0371-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From ad4eebb90434f0752dcbecb8a163e6bfe6ba87dd Mon Sep 17 00:00:00 2001
+From e709b2648076946859a2a2edd80d180b399fd3d1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index c3864b869..589b13f4e 100644
+index c3864b869e..589b13f4ee 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -127,6 +127,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index c3864b869..589b13f4e 100644
          this.b = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index c96a5df80..b09da64c3 100644
+index c96a5df80a..b09da64c3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
diff --git a/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch
index 97c670cdfc..b01524e8dc 100644
--- a/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From b9704a274c9d027079530b52bf6e02ce9164380b Mon Sep 17 00:00:00 2001
+From b82067ae505316dca7048faaedeb7f7565406b6e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 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 1c0b783e8..dad1ff737 100644
+index 1c0b783e8e..dad1ff7372 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,7 +46,7 @@ index 1c0b783e8..dad1ff737 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 9e8bd174e..22d13f7ef 100644
+index 3db1b6bb1b..de45e3c7a8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1536,6 +1536,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -71,7 +71,7 @@ index 9e8bd174e..22d13f7ef 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 3d1cdd627..14f102968 100644
+index 3d1cdd6271..14f1029687 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 3d1cdd627..14f102968 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 {
diff --git a/Spigot-Server-Patches/0373-Add-sun-related-API.patch b/Spigot-Server-Patches/0372-Add-sun-related-API.patch
index 6c9b4abdc0..2c3e89152e 100644
--- a/Spigot-Server-Patches/0373-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0372-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From d8da756f4792ecdda39669d0407a4d76e60cbc21 Mon Sep 17 00:00:00 2001
+From ac264d636345bea08b5ed7a1ff74b972471f6245 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 693973e97..d1e70931e 100644
+index 856ddf2a74..d1ec201d8a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1288,6 +1288,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index 693973e97..d1e70931e 100644
          if (this.world.L() && !this.world.isClientSide) {
              float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bde8ad29b..0f34b4163 100644
+index 728319968b..027bb64acc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -29,7 +29,7 @@ index bde8ad29b..0f34b4163 100644
          return this.G < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index eacecccfd..7c0a53053 100644
+index eacecccfdb..7c0a530533 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -538,6 +538,12 @@ public class CraftWorld implements World {
@@ -46,7 +46,7 @@ index eacecccfd..7c0a53053 100644
          return createExplosion(x, y, z, power, false, true);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154e..40a429942 100644
+index 53c2d154ed..40a429942e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/Spigot-Server-Patches/0374-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch
index e45e363f0b..59aeaa251d 100644
--- a/Spigot-Server-Patches/0374-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From e407281f62615d5c907d7df945bd41eea9e0d8eb Mon Sep 17 00:00:00 2001
+From 27b640541e74e7f1607ad073af6f4b03645d5151 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index b861c623c..0e2b5ee74 100644
+index b861c623cc..0e2b5ee743 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -28,7 +28,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0375-Here-s-Johnny.patch b/Spigot-Server-Patches/0374-Here-s-Johnny.patch
index 1221fba74d..00a75b96b2 100644
--- a/Spigot-Server-Patches/0375-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0374-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 6230a02a2c1701e0d533b11d90147b2b08d9b968 Mon Sep 17 00:00:00 2001
+From a5499b66282e7f75a127044fd454a2927ff7e4f3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 96d0651e9..4bbb4817b 100644
+index 96d0651e9b..4bbb4817b1 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index 96d0651e9..4bbb4817b 100644
          return entity instanceof EntityLiving && ((EntityLiving) entity).df();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d47929..5ff957ced 100644
+index 951d479298..5ff957ced7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
diff --git a/Spigot-Server-Patches/0376-Turtle-API.patch b/Spigot-Server-Patches/0375-Turtle-API.patch
index b3acffe187..bb038523c6 100644
--- a/Spigot-Server-Patches/0376-Turtle-API.patch
+++ b/Spigot-Server-Patches/0375-Turtle-API.patch
@@ -1,11 +1,11 @@
-From da6d5c11859fc142c18eea0194faf0f53c4d58f6 Mon Sep 17 00:00:00 2001
+From 0145dcdb179116632a79d6734a4829db2ee0c740 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index b016e0ae7..a533e0eb5 100644
+index b016e0ae7c..a533e0eb5b 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -103,7 +103,7 @@ index b016e0ae7..a533e0eb5 100644
  
          public void c() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75c..8edcf7af6 100644
+index 123a2c75ca..8edcf7af65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch
index 6e96aa61b6..6e9d3b7540 100644
--- a/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From 6ea9730b2677904875a5180ad75c151f42068262 Mon Sep 17 00:00:00 2001
+From baf45e6afa85406637c126b82ac06e48a949e18f Mon Sep 17 00:00:00 2001
 From: Trigary <[email protected]>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 869bf8a9f..2a912286b 100644
+index 869bf8a9f9..2a912286b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -246,6 +246,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 869bf8a9f..2a912286b 100644
      public boolean firePhysicsEventForRedstone = false;
      private void firePhysicsEventForRedstone() {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 7781babf5..50f620009 100644
+index 7781babf51..50f6200095 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -60,6 +60,17 @@ public class EntityLightning extends EntityWeather {
@@ -69,7 +69,7 @@ index 7781babf5..50f620009 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e71a40580..53e7834cc 100644
+index e71a405807..53e7834cca 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1065,7 +1065,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0378-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 777de9752d..447ddd8c6b 100644
--- a/Spigot-Server-Patches/0378-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 3b7348ab1fc8bd6b8918e0b6a4626ef178eb22aa Mon Sep 17 00:00:00 2001
+From 537a387c3e1511657b618532f2866fbc92e1dd8b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index c9473087a..e723bd339 100644
+index c9473087ad..e723bd339e 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -410,20 +410,22 @@ public class EntityItem extends Entity {
@@ -37,7 +37,7 @@ index c9473087a..e723bd339 100644
          this.f = uuid;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 6036592f7..4128ba4c0 100644
+index 6036592f76..4128ba4c06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
diff --git a/Spigot-Server-Patches/0379-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index c3820f01bd..eb027d1320 100644
--- a/Spigot-Server-Patches/0379-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 0f87ea655baaaa6ca4d45542454bd04f44104ded Mon Sep 17 00:00:00 2001
+From a8c45fca2ef99f438a12b9ca59f9ca0ab03e86d0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 62b5b6ece..60ab1c751 100644
+index 62b5b6ecea..60ab1c7514 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -250,11 +250,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0380-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch
index 256d757dd4..1016ce0a03 100644
--- a/Spigot-Server-Patches/0380-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From a630ba6ecd087103a6cd941d4aa9a58f131b6b07 Mon Sep 17 00:00:00 2001
+From d1b3dc4217aa68d0c522bb1f600ddebb54a191af Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <[email protected]>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 62feadc8a..f1b7353cf 100644
+index 62feadc8af..f1b7353cf8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -59,7 +59,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0381-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch
index df82918f88..f3b4b349d8 100644
--- a/Spigot-Server-Patches/0381-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 030d1e586741e3af6dae59830ea6b957fb4f9f58 Mon Sep 17 00:00:00 2001
+From 5d4e0ebff8236bcee63ca414af432baff1681c40 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <[email protected]>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7f9845d92..52ce8f89e 100644
+index e4972e30ce..cac79686d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -55,7 +55,7 @@ index 7f9845d92..52ce8f89e 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 000000000..fdd8708f9
+index 0000000000..fdd8708f97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 000000000..fdd8708f9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c5801122d..ca76f2a38 100644
+index c5801122dd..ca76f2a380 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -203,7 +203,7 @@ index c5801122d..ca76f2a38 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 4c1110479..c53697914 100644
+index 4c1110479c..c536979140 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -216,7 +216,7 @@ index 4c1110479..c53697914 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index b95836d44..621aad150 100644
+index b95836d443..621aad1503 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -244,7 +244,7 @@ index b95836d44..621aad150 100644
          int j = this.g();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index bdac03da4..430445cc6 100644
+index bdac03da43..430445cc6d 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -259,7 +259,7 @@ index bdac03da4..430445cc6 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index 345843a7f..23c96f44b 100644
+index 345843a7f2..23c96f44b3 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
diff --git a/Spigot-Server-Patches/0382-Add-more-Witch-API.patch b/Spigot-Server-Patches/0381-Add-more-Witch-API.patch
index 9a146b7510..e05cb067a1 100644
--- a/Spigot-Server-Patches/0382-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0381-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From ef215c6f3536a6b336f0cd737f9bafa3d3d896e2 Mon Sep 17 00:00:00 2001
+From 3bbdc053fd65bd8f74f4886348e1833250a3a22b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index feedfc9d9..955e0e19b 100644
+index feedfc9d9c..955e0e19b9 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -94,7 +94,7 @@ index feedfc9d9..955e0e19b 100644
          f = super.applyMagicModifier(damagesource, f);
          if (damagesource.getEntity() == this) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index f25998eb6..ac465bda2 100644
+index f25998eb6d..ac465bda2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -6,6 +6,13 @@ import org.bukkit.craftbukkit.CraftServer;
diff --git a/Spigot-Server-Patches/0383-Fix-MC-93764.patch b/Spigot-Server-Patches/0382-Fix-MC-93764.patch
index 763d8adbeb..cb31e84ca6 100644
--- a/Spigot-Server-Patches/0383-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0382-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From 9bdbdfd3170d2be7b170cf55bc65960fb2b507a8 Mon Sep 17 00:00:00 2001
+From a61ea1bde3ba2fca97d74e75926539f83e504f1a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 99191f09f..4d692b7e0 100644
+index 99191f09f0..4d692b7e05 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
diff --git a/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch
index f61a6d6fa6..9ac4c1b740 100644
--- a/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From c4b7d0c1358a54da78b98fa35c04c114370108b8 Mon Sep 17 00:00:00 2001
+From 92cb3409be8524f1e5684352cd18fc5737491707 Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2a912286b..61ad2cef7 100644
+index 2a912286b2..61ad2cef7b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -583,4 +583,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 2a912286b..61ad2cef7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a7b4439f0..3dfaef056 100644
+index 9a96078004..4705dd2c68 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -341,6 +341,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch
index b7cca278fa..b513b7c2de 100644
--- a/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From cd9b04c415742c09625c3dce302e1271ee90fa7f Mon Sep 17 00:00:00 2001
+From 80169c2065257040205b6544a51cdb3975c14bdb Mon Sep 17 00:00:00 2001
 From: GreenMeanie <[email protected]>
 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 22d13f7ef..8da18b8af 100644
+index de45e3c7a8..f745ed8fee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2335,7 +2335,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 22d13f7ef..8da18b8af 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f1b7353cf..5b1bbc772 100644
+index f1b7353cf8..5b1bbc7724 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1633,6 +1633,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0386-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch
index e6891f0f5c..7e694e4f58 100644
--- a/Spigot-Server-Patches/0386-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 560ee9e68a8e3030c7ae0872505ec276dbe4fefb Mon Sep 17 00:00:00 2001
+From 9cf28103bd677d93deb8ea8a0adf3c095a6e3b73 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 458d1561d..c2bcbbbab 100644
+index 458d1561d0..c2bcbbbab9 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0387-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 6636ea7214..1de9cc7818 100644
--- a/Spigot-Server-Patches/0387-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 3405b5f2508cfb61c5b429d7a5a629ca856e4ad9 Mon Sep 17 00:00:00 2001
+From 36a9e372200a64be4ebbc59acf474aa3e4ac0eff Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b..23f1447cf 100644
+index 71e48e87b4..23f1447cfc 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
diff --git a/Spigot-Server-Patches/0388-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 66d779a433..50b4d30c5f 100644
--- a/Spigot-Server-Patches/0388-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From cc0a58a8c8a6d10ba3460969f2b1267211128d21 Mon Sep 17 00:00:00 2001
+From 1a60b5dbb30c2608e2af7833c00aa29dbb141e20 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
 
 
 diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
-index ee40bccf6..db9af361d 100644
+index ee40bccf63..db9af361d6 100644
 --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
 +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
 @@ -21,7 +21,7 @@ public class DataConverterRegistry {
diff --git a/Spigot-Server-Patches/0389-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch
index 831106f59f..1d43a1d96d 100644
--- a/Spigot-Server-Patches/0389-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch
@@ -1,11 +1,11 @@
-From 77e25caa3b18b13dadcc0b1deb10bc3031eb35b3 Mon Sep 17 00:00:00 2001
+From a7f8efc50ad709eeb7991d8a460ed6075115175d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 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 0f0872c1e..1c1bf85a0 100644
+index 0f0872c1e0..1c1bf85a0e 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -94,7 +94,7 @@ public class BlockTurtleEgg extends Block {
@@ -53,7 +53,7 @@ index 0f0872c1e..1c1bf85a0 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,7 +380,7 @@ 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 7998b80c1..81cc0c3b3 100644
+index 7998b80c17..81cc0c3b33 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -208,7 +208,7 @@ public class EntityZombie extends EntityMonster {
@@ -420,7 +420,7 @@ index 7998b80c1..81cc0c3b3 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 359ac8b88..96a1b1d3f 100644
+index 359ac8b88c..96a1b1d3f2 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -119,7 +119,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -446,7 +446,7 @@ index 359ac8b88..96a1b1d3f 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 53e7834cc..5c2421ac3 100644
+index 53e7834cca..5c2421ac38 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -495,7 +495,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -652,7 +652,7 @@ index 53e7834cc..5c2421ac3 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 7c0a53053..40ee34675 100644
+index 7c0a530533..40ee34675c 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 {
diff --git a/Spigot-Server-Patches/0390-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index 026742c8ef..5bf4fbb30c 100644
--- a/Spigot-Server-Patches/0390-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From b2af8215533a37b4ba09975a4472790ca9a63682 Mon Sep 17 00:00:00 2001
+From 20db885a920ddae1dc283c0c906b2b226739ae89 Mon Sep 17 00:00:00 2001
 From: MisterVector <[email protected]>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 22378b6bc..5e595b62e 100644
+index 22378b6bc8..5e595b62e5 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -380,10 +380,11 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0391-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch
index b731b5994c..c606533e44 100644
--- a/Spigot-Server-Patches/0391-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 354a84e86917aacb348049818f5a2bacb3f4caf7 Mon Sep 17 00:00:00 2001
+From 42871ad2d0b7b9bd4d5ecfafc8b03e532384ff11 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 236fbafeb..ce39ea09e 100644
+index 236fbafeb5..ce39ea09e8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1033,12 +1033,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0392-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch
index db97bcff74..6b8c552f85 100644
--- a/Spigot-Server-Patches/0392-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 6b6d7942e9bb5ad754b836326ea2f9148302156f Mon Sep 17 00:00:00 2001
+From 54bbc25ce96d023b76be2fa5c280bf2d6d8015f3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 23389743d..d25928e09 100644
+index 23389743d5..d25928e094 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -31,10 +31,20 @@ public final class CraftInventoryCreator {
diff --git a/Spigot-Server-Patches/0393-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch
index f68d75a9a1..1454758673 100644
--- a/Spigot-Server-Patches/0393-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From 792f1c9084fbe17db6d7fc1a7f8696076ea3530b Mon Sep 17 00:00:00 2001
+From f84c15041538210bd0cde5c8296beb9d207518ce Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 95b4c0eb1..f83a695a1 100644
+index 0f531e7d42..8e773edc54 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -37,9 +37,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
diff --git a/Spigot-Server-Patches/0394-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch
index b433a45cc3..6fd3c58fbf 100644
--- a/Spigot-Server-Patches/0394-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From b7698e8589cf36333efe29a2299c47fa4be71dcd Mon Sep 17 00:00:00 2001
+From ce9234ee5d3532f7e454a0033d4420c8cdbd6f6c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index cbc8e8d13..cda6f2b73 100644
+index cbc8e8d139..cda6f2b732 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -106,7 +106,11 @@ public class BlockSponge extends Block {
@@ -28,7 +28,7 @@ index cbc8e8d13..cda6f2b73 100644
  }
 +
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 08a5acb0a..aa3547690 100644
+index 08a5acb0ac..aa3547690a 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -236,6 +236,7 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
diff --git a/Spigot-Server-Patches/0395-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch
index efa29a3901..34d64b3a6a 100644
--- a/Spigot-Server-Patches/0395-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,11 +1,11 @@
-From 71f409afaab237ea4e309739295d16c0b1cd232c Mon Sep 17 00:00:00 2001
+From c9b3d48edee5c67f2d1af7bd247e6ec5b634446f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3dfaef056..e8cef58cb 100644
+index 4705dd2c68..0467a8feab 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1207,6 +1207,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch
index ca9e51499c..08411d286c 100644
--- a/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From d0ad57fd8f5cd9986e4cbad278129c2759002d9d Mon Sep 17 00:00:00 2001
+From 6e73e08568141499f1c97c1574d249495b32a2cf Mon Sep 17 00:00:00 2001
 From: theosib <[email protected]>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
diff --git a/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch
index 4cf28f56e0..1f4c47f467 100644
--- a/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 091f9b2150aa9540f90b4795c0f04ca4abba52c7 Mon Sep 17 00:00:00 2001
+From e5b4fd7a68006fa22e4d6efea4893026f03e284e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ 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 8da18b8af..640660605 100644
+index f745ed8fee..a678dc89c8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2097,12 +2097,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 8da18b8af..640660605 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 4bbf57752..f5d9b4abc 100644
+index 4bbf577523..f5d9b4abc2 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 4bbf57752..f5d9b4abc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 14f102968..4d5459d24 100644
+index 14f1029687..4d5459d24f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2479,10 +2479,13 @@ public abstract class EntityLiving extends Entity {
@@ -110,7 +110,7 @@ index 14f102968..4d5459d24 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 5b1bbc772..57c6455bd 100644
+index 5b1bbc7724..57c6455bd8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -784,10 +784,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0398-Book-Size-Limits.patch b/Spigot-Server-Patches/0397-Book-Size-Limits.patch
index 5c903e4460..58ff880c4a 100644
--- a/Spigot-Server-Patches/0398-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0397-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 901472d0286f689ca74f071a98a43dad6c5d2168 Mon Sep 17 00:00:00 2001
+From e2d85e74d938a2486d48169b69af45ffb70eb811 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 52ce8f89e..07f0b4529 100644
+index cac79686d8..c5b8354fa7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -449,4 +449,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index 52ce8f89e..07f0b4529 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e8cef58cb..74b27322f 100644
+index 0467a8feab..5c041c48fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -12,6 +12,8 @@ import java.util.Collections;
diff --git a/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch
index 110aede0c4..a773d1b250 100644
--- a/Spigot-Server-Patches/0399-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 382ea0607828b984ef41ff022e5e74b18b6becf5 Mon Sep 17 00:00:00 2001
+From b9b889e4ac8118cc7aaeba6c4dd296f767002436 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c5b8354fa..9f240c35d 100644
+index c5b8354fa7..9f240c35d6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index c5b8354fa..9f240c35d 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index af065bd70..9c5b79920 100644
+index af065bd705..9c5b79920f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2188,6 +2188,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0400-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0399-Add-more-Zombie-API.patch
index 178e9f66f6..66eae07361 100644
--- a/Spigot-Server-Patches/0400-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0399-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 43af2664a31e1843a4c6a14fc57cebab8b3eef6e Mon Sep 17 00:00:00 2001
+From 71f4a80d0a3fa035ed1bee5c0539f65f0a4b9639 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 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 81cc0c3b3..24bc3e0f0 100644
+index 81cc0c3b33..24bc3e0f08 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -21,8 +21,8 @@ public class EntityZombie extends EntityMonster {
@@ -105,7 +105,7 @@ index 81cc0c3b3..24bc3e0f0 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 {
diff --git a/Spigot-Server-Patches/0401-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
index 1794e3f988..e95bd3c8bb 100644
--- a/Spigot-Server-Patches/0401-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@@ -1,4 +1,4 @@
-From f7085de57b10b4447c4fcf502780a649de366208 Mon Sep 17 00:00:00 2001
+From a55362012ae6439bd007bf980dc0e094b7e9257a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
diff --git a/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch
index 2f96260a6b..80644b4b1a 100644
--- a/Spigot-Server-Patches/0402-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 8aded7fc32eb2d1e7f64a0f98b05ab61371196c8 Mon Sep 17 00:00:00 2001
+From b5b512f38eb6de0b6887ea7b61cc07acb4043188 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b6c602bd0..aa78ccb68 100644
+index 7721dfee65..1454af710e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0403-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch
index 6d872bb9fc..11f1ace845 100644
--- a/Spigot-Server-Patches/0403-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 9536e33637881c75f5956442e16b5b389aa64b52 Mon Sep 17 00:00:00 2001
+From b07b820037f167f150b3af33ed2fff7e9cd88ea6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index c53697914..0b8796d0a 100644
+index c536979140..0b8796d0ae 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index c53697914..0b8796d0a 100644
              NetworkManager.g.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa..2d8e6a2f4 100644
+index 601d4d0fa2..2d8e6a2f4a 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa..2d8e6a2f4 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 2aa805eef..4f7bc186a 100644
+index 2aa805eef1..4f7bc186aa 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 2aa805eef..4f7bc186a 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 8e35d14f9..4a57e8a3e 100644
+index 8e35d14f97..4a57e8a3ec 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -76,7 +76,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index 8e35d14f9..4a57e8a3e 100644
          } else {
              this.d = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index 706d84385..c0d8f8b42 100644
+index 706d843859..c0d8f8b428 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0404-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index b1545855b2..92eadc8e93 100644
--- a/Spigot-Server-Patches/0404-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From edd48edd3662af1687e64c1142d6b74db20e0d16 Mon Sep 17 00:00:00 2001
+From 240f4d59799fbc801df981f49420cf9b5a9b563f Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 698cfb918..fbdb2df27 100644
+index 698cfb918b..fbdb2df27d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -27,12 +27,12 @@ import org.bukkit.plugin.Plugin;
diff --git a/Spigot-Server-Patches/0405-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch
index 881e2d03f2..8327d25067 100644
--- a/Spigot-Server-Patches/0405-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 2d8964a5789d209c5ff26da414b9129e602c40ac Mon Sep 17 00:00:00 2001
+From 162fee0c9a057136c8fc744b62f1c0926a1e6220 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index ca76f2a38..dfe7a029f 100644
+index ca76f2a380..dfe7a029f8 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -50,7 +50,7 @@ index ca76f2a38..dfe7a029f 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 0b8796d0a..553637239 100644
+index 0b8796d0ae..553637239c 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -16,6 +16,7 @@ import io.netty.handler.timeout.TimeoutException;
diff --git a/Spigot-Server-Patches/0406-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch
index 7cf2d72e56..870a384ec9 100644
--- a/Spigot-Server-Patches/0406-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From f18f9c31dd37e88747b1c19a657bf7878de484ae Mon Sep 17 00:00:00 2001
+From 747ca560c9bc065b36c1649811507dc0d1a6e456 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index e4aba0e0a..945040442 100644
+index e4aba0e0a8..9450404428 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -297,7 +297,8 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index e720f63fbe..e587636248 100644
--- a/Spigot-Server-Patches/0407-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From fb964090a750bb5e7bce0e13a43b0c77089c35d0 Mon Sep 17 00:00:00 2001
+From de09720b1332eaf211d79f51318a4c3c1a12eb2e Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 57c6455bd..541461275 100644
+index 57c6455bd8..541461275c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 57c6455bd..541461275 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ec760325b..135d25abd 100644
+index ec760325ba..135d25abd2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -95,6 +95,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index ec760325b..135d25abd 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index fbdb2df27..e1973c5d6 100644
+index fbdb2df27d..e1973c5d67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -245,6 +245,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index fbdb2df27..e1973c5d6 100644
          NBTTagCompound data = getData();
          if (data == null) return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8d32982c5..a03796cd5 100644
+index 8d32982c53..a03796cd5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0408-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch
index 7cda1338d2..0d88970c0f 100644
--- a/Spigot-Server-Patches/0408-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From a0135105f12f99ae603f67df283cf5a0961c5769 Mon Sep 17 00:00:00 2001
+From a5eec7e0b987b7adeeb8a9ec29aaa09b003b8860 Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 74b27322f..bd3653be4 100644
+index 5c041c48fa..f63943f29f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -823,10 +823,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0409-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index a628d67101..fd3b6aa990 100644
--- a/Spigot-Server-Patches/0409-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From c30ea95b78ae18005efefec5a38836d7b8c423b2 Mon Sep 17 00:00:00 2001
+From c693e26da2f98ce91cb05d220f05c5faf5a253c3 Mon Sep 17 00:00:00 2001
 From: connorhartley <[email protected]>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 541461275..1d3730083 100644
+index 541461275c..1d37300832 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1119,6 +1119,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0410-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index b7a420b87c..a6d13d2990 100644
--- a/Spigot-Server-Patches/0410-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From 5554a8ccf3d8199dea0a55f4104cd265c4d39b06 Mon Sep 17 00:00:00 2001
+From c9cd937ba5a7735bb88c1be1b478d0adcc871a9a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index dbe0ff33a..0109484e0 100644
+index dbe0ff33a0..0109484e0a 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -118,7 +118,7 @@ public class BlockPiston extends BlockDirectional {
diff --git a/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch
index 5a737a2697..681f6c4b2e 100644
--- a/Spigot-Server-Patches/0411-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From dd23504083434453e3791d16ef952d747eba9bd3 Mon Sep 17 00:00:00 2001
+From 355b9a0bb1d1af72cb61b3f8850c5b387dcf7b89 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a03796cd5..eb5971ac1 100644
+index a03796cd5e..eb5971ac19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1942,6 +1942,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0412-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch
index e8e8711d86..99f072cb83 100644
--- a/Spigot-Server-Patches/0412-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From a159e031449910796e17ce6bf645972011605b65 Mon Sep 17 00:00:00 2001
+From 828d56a3dccc292ea38fa319aaec5477291e3e8c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 12268f87b..e1f7e06ab 100644
+index 12268f87b9..e1f7e06ab2 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -39,6 +39,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index 12268f87b..e1f7e06ab 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index c20511588..82f7af46f 100644
+index c20511588d..82f7af46f8 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -78,6 +78,7 @@ public class RegionFile {
@@ -251,7 +251,7 @@ index c20511588..82f7af46f 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 8c8b7cbab..17e76815a 100644
+index 8c8b7cbab5..17e76815ad 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -16,6 +16,7 @@ public class RegionFileCache {
diff --git a/Spigot-Server-Patches/0413-BlockDestroyEvent.patch b/Spigot-Server-Patches/0412-BlockDestroyEvent.patch
index ef0037eb1d..d03864e226 100644
--- a/Spigot-Server-Patches/0413-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0412-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From d6bef87db05d23c6dea48e59f68f0706f63ea70a Mon Sep 17 00:00:00 2001
+From 340d46ba0e1d0bac0baffe2a0bcfa0d87fcff70e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index aa78ccb68..0624848cc 100644
+index 1454af710e..e280b58531 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0414-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index c45c2db214..795914e5e8 100644
--- a/Spigot-Server-Patches/0414-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 8076fb34e182a4674a5f985fe2327491f6294e39 Mon Sep 17 00:00:00 2001
+From 9ba6775e3eddfd4b8af01471ce6cf7b3a658291a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
@@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped
 
 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index 819b4ac2d..ea4083a45 100644
+index 819b4ac2da..ea4083a45a 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
 @@ -62,18 +62,47 @@ public class ShapelessRecipes implements IRecipe {
diff --git a/Spigot-Server-Patches/0415-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch
index b802eda810..d2f316477c 100644
--- a/Spigot-Server-Patches/0415-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From 61245c33905e034f89946592a7f8d42be2796817 Mon Sep 17 00:00:00 2001
+From c1585662600e8e6bfee07aa5a791f388de85717a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bd3653be4..690d932e3 100644
+index f63943f29f..b193fbab47 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2511,7 +2511,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2512,7 +2512,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  
@@ -19,7 +19,7 @@ index bd3653be4..690d932e3 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index c2bcbbbab..fdb771317 100644
+index c2bcbbbab9..fdb771317a 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -14,6 +14,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0416-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch
index f485a193f4..5ff9668fb1 100644
--- a/Spigot-Server-Patches/0416-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 20caaee28c1b76471f55dd356568c9380c07df20 Mon Sep 17 00:00:00 2001
+From 9278475d36f65e5b95b44b28ff15b9524015973e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 690d932e3..c4edb5b85 100644
+index b193fbab47..188e450a13 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -104,6 +104,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -33,7 +33,7 @@ index 690d932e3..c4edb5b85 100644
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
-@@ -2527,6 +2528,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2528,6 +2529,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0417-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index f31a40f940..f20ecbfc99 100644
--- a/Spigot-Server-Patches/0417-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 5c32222fa29000441f4be1bd0a3423cd519bb89a Mon Sep 17 00:00:00 2001
+From f0aeb314f4816c28b5007dbfbdb005d10143d724 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
@@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index fdb771317..d0a91f675 100644
+index fdb771317a..d0a91f6755 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -15,6 +15,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0418-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index d7992fa78d..f6473b2618 100644
--- a/Spigot-Server-Patches/0418-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From 3fb9b4659a7ce71a5b57e0df3ae085d6dc2762e0 Mon Sep 17 00:00:00 2001
+From d2464a0cfa4f2c0bb30336e4e6d7d757649c7a21 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
@@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 553637239..30f646e42 100644
+index 553637239c..30f646e421 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -221,6 +221,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -31,7 +31,7 @@ index 553637239..30f646e42 100644
  
      // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4..8d0965a05 100644
+index 2d8e6a2f4a..8d0965a053 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
@@ -43,7 +43,7 @@ index 2d8e6a2f4..8d0965a05 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 4a57e8a3e..eb54bdb64 100644
+index 4a57e8a3ec..eb54bdb642 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -23,6 +23,13 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0419-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 22b25a7016..ef291025d5 100644
--- a/Spigot-Server-Patches/0419-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From d7db57b339c57a92499d3cf10f4d6f55ad3fc104 Mon Sep 17 00:00:00 2001
+From 4ff4f66ea29bd8405f2e5182c9746214f12b53a3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index b7cde4d41..949039f89 100644
+index b7cde4d418..949039f89a 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -23,7 +23,7 @@ index b7cde4d41..949039f89 100644
          this.e = flag;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 135d25abd..408c382d2 100644
+index 135d25abd2..408c382d2a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -63,7 +63,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0420-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 450bb4de76..7e9f056a76 100644
--- a/Spigot-Server-Patches/0420-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 727fe100a19532c038f152a5dd279eb293a62e2a Mon Sep 17 00:00:00 2001
+From ff4860cb5f82d587c904247af5dafe3e4f2916a9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 24bc3e0f0..bf2bed002 100644
+index 24bc3e0f08..bf2bed0029 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -175,6 +175,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/Spigot-Server-Patches/0421-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 6edc093ebc..1405803fdc 100644
--- a/Spigot-Server-Patches/0421-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From b47b695772ea905a1556f6db24b198709000ab74 Mon Sep 17 00:00:00 2001
+From 6bf7f6d474e8bb96afb2cbdd3c273f9a25c269da Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 408c382d2..b1630137e 100644
+index 408c382d2a..b1630137ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1329,6 +1329,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0422-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index d6e5090f83..3862458b05 100644
--- a/Spigot-Server-Patches/0422-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From eafb2cc37ab642330de42277e7e84bcb504988ea Mon Sep 17 00:00:00 2001
+From f914570652750a8a7d94fe7ccb6b8a860f3c5d25 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
@@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index eba6aadad..3a332e980 100644
+index eba6aadad7..3a332e980d 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch
index 0659352a5e..5d114156b9 100644
--- a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 12731060cb2596d81c5efd7c77c929168b50e79e Mon Sep 17 00:00:00 2001
+From 6878901664ce139320799123c21205c632518b94 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 7734712af..dce52ac0f 100644
+index 7734712af9..dce52ac0fa 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1134,7 +1134,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -23,7 +23,7 @@ index 7734712af..dce52ac0f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 640660605..3449b86da 100644
+index a678dc89c8..581c78e003 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 640660605..3449b86da 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 b2d2de7f8..af38e5396 100644
+index b2d2de7f81..af38e5396e 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -117,7 +117,7 @@ public abstract class MobSpawnerAbstract {
@@ -85,7 +85,7 @@ index b2d2de7f8..af38e5396 100644
                      if (entity == null) {
                          this.i();
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b1630137e..df416e3b5 100644
+index b1630137ec..df416e3b59 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -196,7 +196,7 @@ public abstract class PlayerList {
@@ -98,7 +98,7 @@ index b1630137e..df416e3b5 100644
              if (entity != null) {
                  UUID uuid = nbttagcompound1.a("Attach");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0624848cc..9faed9303 100644
+index e280b58531..0e8025d311 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1084,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -110,7 +110,7 @@ index 0624848cc..9faed9303 100644
              return regionLimited.addEntity(entity, spawnReason);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a0e1a70d4..a12dd4779 100644
+index a0e1a70d43..a12dd4779d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -861,5 +861,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 1ef2078b29..c96473b008 100644
--- a/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 60b76b471464505db520bfd096b006c320864b44 Mon Sep 17 00:00:00 2001
+From 07bc019d7485fc75328f148ca9498a5216a3f657 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a70a64070..bfd690ecc 100644
+index a70a64070e..bfd690eccd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -598,4 +598,14 @@ public class PaperWorldConfig {
@@ -36,7 +36,7 @@ index a70a64070..bfd690ecc 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java b/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java
-index a10a5bc13..a5a63f800 100644
+index a10a5bc138..a5a63f8004 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java
 @@ -7,6 +7,7 @@ import net.minecraft.server.IAnimal;
diff --git a/Spigot-Server-Patches/0425-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch
index 5ef80cfb09..c524fdbbe1 100644
--- a/Spigot-Server-Patches/0425-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,14 +1,14 @@
-From b75921430d01070026e081910ccfb2785c4a4b24 Mon Sep 17 00:00:00 2001
+From a10f5f8613944c8b57e54babc61a3f93fc878433 Mon Sep 17 00:00:00 2001
 From: AgentTroll <[email protected]>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c4edb5b85..65e76491b 100644
+index 188e450a13..c1ee63271e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1974,7 +1974,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1975,7 +1975,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
                      if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
                          // Refresh the current entity metadata
diff --git a/Spigot-Server-Patches/0426-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch
index f203d2b489..330293f1b8 100644
--- a/Spigot-Server-Patches/0426-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch
@@ -1,4 +1,4 @@
-From 7ec017a7334afb1f9abf3e69d755fdc797ce68ed Mon Sep 17 00:00:00 2001
+From d93407a6a86afa6ade028a6285c54b2b5374dd9f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
diff --git a/Spigot-Server-Patches/0427-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch
index 96c853ebb9..a66cd22a10 100644
--- a/Spigot-Server-Patches/0427-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From c02e172560f6518901f1bec9105493329b0938af Mon Sep 17 00:00:00 2001
+From 86fdb38b7adbe22c2122182b9aaa623e0cc59b52 Mon Sep 17 00:00:00 2001
 From: MisterVector <[email protected]>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b1630137e..fbabe5fdf 100644
+index df416e3b59..012238ac2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -663,9 +663,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0428-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 5b4d1a8e49..44f01f4a06 100644
--- a/Spigot-Server-Patches/0428-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From be2655721b882338f58cc53bbeeec14af6589769 Mon Sep 17 00:00:00 2001
+From 8e7a5ca3bc46e18ff3d7bde7ca3cbe7b713623a8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index e723bd339..5f6e81372 100644
+index e723bd339e..5f6e813724 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -58,6 +58,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0429-Don-t-update-entity-trackers-for-worlds-without-play.patch b/Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch
index efd5e4b931..e3348db920 100644
--- a/Spigot-Server-Patches/0429-Don-t-update-entity-trackers-for-worlds-without-play.patch
+++ b/Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch
@@ -1,4 +1,4 @@
-From 2d10001164d6563f0776f9817261f653e036e67c Mon Sep 17 00:00:00 2001
+From efd33c3794e72cc40a77a3e58ecf90aec6efd6c2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 24 Mar 2019 18:52:31 +0000
 Subject: [PATCH] Don't update entity trackers for worlds without players
@@ -14,7 +14,7 @@ server->client updates here, which is what this code is intended to do,
 and all players should be untracked.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ce39ea09e..b93fccf91 100644
+index ce39ea09e8..b93fccf919 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1113,7 +1113,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0430-Server-Tick-Events.patch b/Spigot-Server-Patches/0429-Server-Tick-Events.patch
index c676e7bc3d..afc6fba092 100644
--- a/Spigot-Server-Patches/0430-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0429-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 1c8319a0ee657a502aa5f7a42fb4a2668928ecbd Mon Sep 17 00:00:00 2001
+From 0051bbc2ee1699aed51c6ca5dddb1a3f033aa444 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b93fccf91..d6250c472 100644
+index b93fccf919..d6250c4722 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -927,6 +927,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0431-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch
index 1e72eb85dd..7f1815dcfa 100644
--- a/Spigot-Server-Patches/0431-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From c2d817326641fd28090ef59ea0da9e6877796bb4 Mon Sep 17 00:00:00 2001
+From 4feb8f9b2bffe706d9eade116d6bf311dc77c451 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1d3730083..b9d0c0f74 100644
+index 1d37300832..b9d0c0f740 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -490,6 +490,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0432-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch
index 52b64ec818..33633082d6 100644
--- a/Spigot-Server-Patches/0432-Optimize-Persistent-Data-Loading.patch
+++ b/Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch
@@ -1,4 +1,4 @@
-From 56239b2abe648882c297d69867015b4831b5a347 Mon Sep 17 00:00:00 2001
+From f640bef2e74224aa9ef01b0351f951e9e5b517d7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading
diff --git a/Spigot-Server-Patches/0433-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch
index 3cc4c1f497..da68f4a055 100644
--- a/Spigot-Server-Patches/0433-Allow-login-events-to-fire-only-after-the-server-plu.patch
+++ b/Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch
@@ -1,4 +1,4 @@
-From c285a117f05799e780ccde777d07772c5cacbc05 Mon Sep 17 00:00:00 2001
+From 75a702d4b18f81dd7b3a17296e9ddef09f7b67d1 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are
@@ -7,7 +7,7 @@ Subject: [PATCH] Allow login events to fire only after the server plugins are
 Event threads will simply block until they're ready to accept.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index dfe7a029f..503f66582 100644
+index dfe7a029f8..503f665820 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -282,6 +282,36 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -56,7 +56,7 @@ index dfe7a029f..503f66582 100644
                              java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress();
                              java.util.UUID uniqueId = i.getId();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d6250c472..8db5c6a35 100644
+index d6250c4722..8db5c6a351 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -606,6 +606,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0434-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch
index c7d103d74c..f7cbe7384b 100644
--- a/Spigot-Server-Patches/0434-Make-region-files-more-reliable-to-write-to.patch
+++ b/Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch
@@ -1,4 +1,4 @@
-From 02b4c29fffa41faa34fe06a20db138134040b9bc Mon Sep 17 00:00:00 2001
+From ed7d354ccaa9465fd12030d6a0621780ecbe14fc Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to
@@ -37,7 +37,7 @@ affect save performance if the startup flag is used (especially on
 HDDs).
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 82f7af46f..e5659980b 100644
+index 82f7af46f8..e5659980b3 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -29,7 +29,7 @@ public class RegionFile {
diff --git a/Spigot-Server-Patches/0435-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch
index 1075466439..3068614997 100644
--- a/Spigot-Server-Patches/0435-Optimize-GameRules-to-use-LinkedHashMap.patch
+++ b/Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch
@@ -1,4 +1,4 @@
-From 14952f6e3e04fbfb6be1ae4e959b0cefe58681b5 Mon Sep 17 00:00:00 2001
+From dac566303446ee307bd3875361c7bf94a192e45b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap
diff --git a/Spigot-Server-Patches/0436-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch
index 41b0ecde1c..180c255bea 100644
--- a/Spigot-Server-Patches/0436-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 746b2dc3bcd9c7adcce8648dcf5ee18874a5e5cb Mon Sep 17 00:00:00 2001
+From fd269acdf74f64fba07aebd29ec472cd6f597c70 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
diff --git a/Spigot-Server-Patches/0437-Add-Heightmap-API.patch b/Spigot-Server-Patches/0436-Add-Heightmap-API.patch
index 8b06d16537..a051e25809 100644
--- a/Spigot-Server-Patches/0437-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0436-Add-Heightmap-API.patch
@@ -1,11 +1,11 @@
-From aae0b5f4b74ab34bbd6d0f3bcd5c34e78bcffabb Mon Sep 17 00:00:00 2001
+From 899b3fb3c22a1f365bfef5318b90b99b632c0a49 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b940f95bd..d20f6ac7e 100644
+index b940f95bdb..d20f6ac7e4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -720,6 +720,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -17,7 +17,7 @@ index b940f95bd..d20f6ac7e 100644
          int k;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 40ee34675..457aa5a3f 100644
+index 40ee34675c..457aa5a3f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -136,6 +136,28 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0438-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch
index d7da65805e..5f044d3c10 100644
--- a/Spigot-Server-Patches/0438-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From ea03a714afb61798851be72f35684477ce4e5710 Mon Sep 17 00:00:00 2001
+From d0f37a6611ca8b011d391ced8e259e23b78aaee9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
diff --git a/Spigot-Server-Patches/0439-Fix-NPE-from-sign-placement.patch b/Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch
index 4f85103c0e..11bb5611be 100644
--- a/Spigot-Server-Patches/0439-Fix-NPE-from-sign-placement.patch
+++ b/Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch
@@ -1,4 +1,4 @@
-From 89feaae0a193a0443bfe41f2306ac1819e93f7b2 Mon Sep 17 00:00:00 2001
+From d5c2e00a30aa96c665393676e4dc49aa0a2feed2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Wed, 17 Apr 2019 00:48:59 +0100
 Subject: [PATCH] Fix NPE from sign placement
@@ -33,7 +33,7 @@ index 11045ee1e1..7808aed0c0 100644
              // CraftBukkit end
          }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index eb130c0121..993de2bded 100644
+index f8d82a0276..ccc0826bc6 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -305,7 +305,12 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0440-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch
index 5a8f809575..d3596719d4 100644
--- a/Spigot-Server-Patches/0440-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch
@@ -1,4 +1,4 @@
-From 40b3656ef01220c3535adea82aede58d508640e7 Mon Sep 17 00:00:00 2001
+From 965a2dc88afd9fb86088110cf7104e3aae020428 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <[email protected]>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
diff --git a/Spigot-Server-Patches/0441-don-t-NPE-on-dimensionmanager-toString.patch b/Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch
index 86c250352f..4593ed7d1f 100644
--- a/Spigot-Server-Patches/0441-don-t-NPE-on-dimensionmanager-toString.patch
+++ b/Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch
@@ -1,4 +1,4 @@
-From a3806a6b05952622de26ba33ebafd06929523f4c Mon Sep 17 00:00:00 2001
+From 77a1e11685c6e91533e16f35ae3f0fe4fefbffc1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 22 Apr 2019 19:51:14 +0100
 Subject: [PATCH] don't NPE on dimensionmanager toString
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 7634491fdee5c9ac4f0bfcf0b4bd1b51c2072b0
+Subproject da08d02251823cbf94d5f896fcbb33c2e7a871f
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 7c395d429ce2bdfe9668664ebe96799cd540e7b
+Subproject a46fdbc62c828e3f038cacbad9b32607dcc5a2f