diff --git a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
index 27288c31..20f56158 100644
--- a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
+++ b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
@@ -1,14 +1,14 @@
-From 46d52484ca3e267f64100d3526ed82665dde88ff Mon Sep 17 00:00:00 2001
+From 1029626ed6052d978d64c3f475fc7a44eb0e3369 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 15 May 2017 15:16:15 +1000
 Subject: [PATCH] Skeleton API Implementations
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d0532011a..3ed50a5fc 100644
+index 001703ba..0646994e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2007,4 +2007,9 @@ public final class Bukkit {
+@@ -2083,4 +2083,9 @@ public final class Bukkit {
      public static UnsafeValues getUnsafe() {
          return server.getUnsafe();
      }
@@ -19,10 +19,10 @@ index d0532011a..3ed50a5fc 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e0df92531..5a0d6ec51 100644
+index 130c169f..d00bdede 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1709,4 +1709,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1778,4 +1778,13 @@ public interface Server extends PluginMessageRecipient {
      @Deprecated
      @NotNull
      UnsafeValues getUnsafe();
@@ -37,7 +37,7 @@ index e0df92531..5a0d6ec51 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index aecb77d0a..b9b32cb9f 100644
+index 682854c0..46fda0b4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2639,6 +2639,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -57,7 +57,7 @@ index aecb77d0a..b9b32cb9f 100644
       * Find the closest nearby location with a biome matching the provided
       * {@link Biome}(s). Finding biomes can, and will, block if the world is looking
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index a7a2587b4..4b6b95404 100644
+index a7a2587b..4b6b9540 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -53,4 +53,13 @@ public interface CommandSender extends Permissible {
@@ -75,7 +75,7 @@ index a7a2587b4..4b6b95404 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 764c502c6..ead9a9aaa 100644
+index 764c502c..ead9a9aa 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -714,4 +714,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -94,7 +94,7 @@ index 764c502c6..ead9a9aaa 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
-index 158ac20f8..d913298ea 100644
+index 158ac20f..d913298e 100644
 --- a/src/main/java/org/bukkit/entity/LightningStrike.java
 +++ b/src/main/java/org/bukkit/entity/LightningStrike.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -120,7 +120,7 @@ index 158ac20f8..d913298ea 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index de462c239..76bf37b54 100644
+index de462c23..76bf37b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1921,4 +1921,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -139,7 +139,7 @@ index de462c239..76bf37b54 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index d650da50e..f740bebee 100644
+index d650da50..f740bebe 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 @@ -185,4 +185,13 @@ public interface BookMeta extends ItemMeta {
diff --git a/Bukkit-Patches/0003-Spigot-Timings.patch b/Bukkit-Patches/0003-Spigot-Timings.patch
index 32cf7e92..1fd32525 100644
--- a/Bukkit-Patches/0003-Spigot-Timings.patch
+++ b/Bukkit-Patches/0003-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From f88d4f285bbdffae13ad5e964eaa13557a60087f Mon Sep 17 00:00:00 2001
+From 5452ddb797359810de9a6366d7f4128d35c6bba7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings
@@ -8,10 +8,10 @@ Adds performance tracking timings all around the Minecraft Server, and improves
 Plugins can track their own timings with CustomTimingsHandler
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3ed50a5f..ffb6ff57 100644
+index 0646994e..ea881e5b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -831,6 +831,7 @@ public final class Bukkit {
+@@ -832,6 +832,7 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -20,10 +20,10 @@ index 3ed50a5f..ffb6ff57 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5a0d6ec5..8c953ae8 100644
+index d00bdede..9f75c1bf 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1713,6 +1713,10 @@ public interface Server extends PluginMessageRecipient {
+@@ -1782,6 +1782,10 @@ public interface Server extends PluginMessageRecipient {
      // Spigot start
      public class Spigot {
  
diff --git a/Bukkit-Patches/0010-BungeeCord-Chat-API.patch b/Bukkit-Patches/0010-BungeeCord-Chat-API.patch
index ebf9b32d..2661504b 100644
--- a/Bukkit-Patches/0010-BungeeCord-Chat-API.patch
+++ b/Bukkit-Patches/0010-BungeeCord-Chat-API.patch
@@ -1,11 +1,11 @@
-From f3b4b93b8b101271cc46d195ffbd3c71865d7309 Mon Sep 17 00:00:00 2001
+From e1105c27ca4ca7279d6a316f311c0ef7fa749a1e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 02:59:14 +0100
 Subject: [PATCH] BungeeCord Chat API
 
 
 diff --git a/pom.xml b/pom.xml
-index de37d1945..a464312b6 100644
+index de37d194..a464312b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -52,6 +52,13 @@
@@ -23,7 +23,7 @@ index de37d1945..a464312b6 100644
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 6149c77df..e3f185dc9 100644
+index 6149c77d..e3f185dc 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -15,91 +15,223 @@ public enum ChatColor {
@@ -285,10 +285,10 @@ index 6149c77df..e3f185dc9 100644
       * Gets the char value associated with this color
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8c953ae8b..75d5b2904 100644
+index 9f75c1bf..6f296643 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1717,6 +1717,24 @@ public interface Server extends PluginMessageRecipient {
+@@ -1786,6 +1786,24 @@ public interface Server extends PluginMessageRecipient {
          public org.bukkit.configuration.file.YamlConfiguration getConfig() {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -314,7 +314,7 @@ index 8c953ae8b..75d5b2904 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index 4b6b95404..284be63a1 100644
+index 4b6b9540..284be63a 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -57,6 +57,43 @@ public interface CommandSender extends Permissible {
@@ -362,7 +362,7 @@ index 4b6b95404..284be63a1 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 052f9e692..3d84a75a6 100644
+index 052f9e69..3d84a75a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1952,6 +1952,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -425,7 +425,7 @@ index 052f9e692..3d84a75a6 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index f740bebee..94852d50e 100644
+index f740bebe..94852d50 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 @@ -1,6 +1,7 @@
diff --git a/Bukkit-Patches/0011-Add-restart-API.patch b/Bukkit-Patches/0011-Add-restart-API.patch
index fdeffa31..c78ca299 100644
--- a/Bukkit-Patches/0011-Add-restart-API.patch
+++ b/Bukkit-Patches/0011-Add-restart-API.patch
@@ -1,14 +1,14 @@
-From 21bba4862276e7261598f410d7f7b440f02240cd Mon Sep 17 00:00:00 2001
+From eca34aa3995a4038fa29936a4e7bef123447448a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 13 Jul 2015 19:10:15 +1000
 Subject: [PATCH] Add restart API.
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 75d5b290..8263a17a 100644
+index 6f296643..0f38cffd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1735,6 +1735,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1804,6 +1804,13 @@ public interface Server extends PluginMessageRecipient {
          public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
index b39b8cbe..de3ab868 100644
--- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From 364475b84f9a58853e2a20326f98c47433773c1d Mon Sep 17 00:00:00 2001
+From 99566e79af36b65b405a12a4f1b15e5555637f25 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b77e1e0781..2a2b2e1eb0 100644
+index b1787a45f..6c1555761 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2362,4 +2362,16 @@ public final class CraftServer implements Server {
+@@ -2423,4 +2423,16 @@ public final class CraftServer implements Server {
      public UnsafeValues getUnsafe() {
          return CraftMagicNumbers.INSTANCE;
      }
@@ -27,10 +27,10 @@ index b77e1e0781..2a2b2e1eb0 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5955306f44..7ea2af5539 100644
+index c71f276cc..c9002842f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1949,4 +1949,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1951,4 +1951,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              this.persistentDataContainer.putAll((NBTTagCompound) c);
          }
      }
@@ -47,7 +47,7 @@ index 5955306f44..7ea2af5539 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
-index f9d3b5a499..b63472322d 100644
+index f9d3b5a49..b63472322 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
 @@ -132,4 +132,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
@@ -63,7 +63,7 @@ index f9d3b5a499..b63472322d 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-index 7fa2588b89..e0acbada89 100644
+index 7fa2588b8..e0acbada8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 @@ -90,4 +90,16 @@ public abstract class ServerCommandSender implements CommandSender {
@@ -84,7 +84,7 @@ index 7fa2588b89..e0acbada89 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b093c78f80..e89ef7b7ad 100644
+index 4c6122822..380c76c43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1169,4 +1169,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -104,7 +104,7 @@ index b093c78f80..e89ef7b7ad 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index 3a4fb14bff..3a68e1cf5c 100644
+index 3a4fb14bf..3a68e1cf5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 @@ -50,4 +50,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
@@ -124,10 +124,10 @@ index 3a4fb14bff..3a68e1cf5c 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 97df91de67..a11dfb26bb 100644
+index bece7b86b..843fd71a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2153,4 +2153,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2155,4 +2155,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean isAllowingServerListings() {
          return getHandle().allowsListing();
      }
@@ -144,7 +144,7 @@ index 97df91de67..a11dfb26bb 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index d522ff8813..03b5764552 100644
+index d522ff881..03b576455 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -347,6 +347,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
diff --git a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
index a4109dc2..05f48b81 100644
--- a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From 519f437fa5bc84f1813b1d4b4c4a5132f0b87776 Mon Sep 17 00:00:00 2001
+From db1aa3864945f3dff4cf7e56dd5202ec1125c7cc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
 This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
-index d4f6aeced3..15d0290ba7 100644
+index 475990969..acb5448b1 100644
 --- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 +++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 @@ -221,7 +221,10 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -31,10 +31,10 @@ index d4f6aeced3..15d0290ba7 100644
              } else {
                  merge(entityitem, itemstack1, this, itemstack);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a5906de1ed..993b594b82 100644
+index ca50697b5..5f4c690ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -691,6 +691,23 @@ public class CraftEventFactory {
+@@ -693,6 +693,23 @@ public class CraftEventFactory {
                  return true;
              }
              event = CraftEventFactory.callLightningStrikeEvent((LightningStrike) entity.getBukkitEntity(), cause);
@@ -59,7 +59,7 @@ index a5906de1ed..993b594b82 100644
              event = CraftEventFactory.callEntitySpawnEvent(entity);
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index f42972427b..5ff085b9e6 100644
+index f42972427..5ff085b9e 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -134,4 +134,18 @@ public class SpigotWorldConfig
diff --git a/CraftBukkit-Patches/0006-Async-Operation-Catching.patch b/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
index 577cba0b..1d190033 100644
--- a/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From e761eaa4630a5fc89569fc13f464cf2ce41fcfba Mon Sep 17 00:00:00 2001
+From 01745be2ba8cd7ab5460f0da3916948046fbf9a9 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -122,7 +122,7 @@ index 1a8d0e568..148c01954 100644
              world.removeBlockEntity(blockposition);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42049a0ad..4563cbc38 100644
+index db28a1d1a..24d5cead3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -854,6 +854,7 @@ public final class CraftServer implements Server {
@@ -134,7 +134,7 @@ index 42049a0ad..4563cbc38 100644
          if (commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 90c826fe3..8a23c7441 100644
+index c9002842f..648a24402 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -273,6 +273,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -172,7 +172,7 @@ index 90c826fe3..8a23c7441 100644
 @@ -841,6 +845,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
-     public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
+     public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<? super Entity> filter) {
 +        org.spigotmc.AsyncCatcher.catchOp("getNearbyEntities"); // Spigot
          Preconditions.checkArgument(boundingBox != null, "BoundingBox cannot be null");
  
@@ -186,7 +186,7 @@ index 90c826fe3..8a23c7441 100644
          boolean oldSave = world.noSave;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e89ef7b7a..efd781c34 100644
+index 380c76c43..1e6b8dec5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -567,6 +567,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -198,7 +198,7 @@ index e89ef7b7a..efd781c34 100644
          List<Entity> notchEntityList = entity.level().getEntities(entity, entity.getBoundingBox().inflate(x, y, z), Predicates.alwaysTrue());
          List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a11dfb26b..f91e28d75 100644
+index 843fd71a5..539ba62c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -388,6 +388,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0007-View-Distance.patch b/CraftBukkit-Patches/0007-View-Distance.patch
index da3a0ef7..328e8dc9 100644
--- a/CraftBukkit-Patches/0007-View-Distance.patch
+++ b/CraftBukkit-Patches/0007-View-Distance.patch
@@ -1,4 +1,4 @@
-From 811e9bf62593a4f7b107c4585eeea0d63cbce0ec Mon Sep 17 00:00:00 2001
+From 3c14f625027c09a49b5c1577784964013fa76fef Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
@@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
 This commit allows the user to select per world view distances.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 2437fc257b..bce7deb65c 100644
+index 2437fc257..bce7deb65 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -279,8 +279,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -21,7 +21,7 @@ index 2437fc257b..bce7deb65c 100644
  
          Objects.requireNonNull(this.entityManager);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7b1dd5edbd..1fc1e46e73 100644
+index f836b07ca..16dcde6b3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -235,7 +235,8 @@ public abstract class PlayerList {
@@ -44,10 +44,10 @@ index 7b1dd5edbd..1fc1e46e73 100644
          entityplayer1.connection.send(new PacketPlayOutSpawnPosition(worldserver1.getSharedSpawnPos(), worldserver1.getSharedSpawnAngle()));
          entityplayer1.connection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ab20f5e109..0a509f85f5 100644
+index 648a24402..bbce80b7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1956,6 +1956,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1958,6 +1958,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
      }
  
@@ -67,7 +67,7 @@ index ab20f5e109..0a509f85f5 100644
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
      {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5ff085b9e6..acaf903011 100644
+index 5ff085b9e..acaf90301 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -148,4 +148,36 @@ public class SpigotWorldConfig
diff --git a/CraftBukkit-Patches/0008-Spigot-Timings.patch b/CraftBukkit-Patches/0008-Spigot-Timings.patch
index 5cbe985d..3dedca03 100644
--- a/CraftBukkit-Patches/0008-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0008-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From 50f817e2fdc37bdd6edc6997ffa496fb86808cca Mon Sep 17 00:00:00 2001
+From b6951794efd66e76425131a9a3cf2756d475c4f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
 Overhauls the Timings System adding performance tracking all around the Minecraft Server
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6b1329ad84..a7171e995e 100644
+index 6b1329ad8..a7171e995 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,6 +187,8 @@ import org.bukkit.craftbukkit.Main;
@@ -119,7 +119,7 @@ index 6b1329ad84..a7171e995e 100644
          this.profiler.popPush("send chunks");
          iterator = this.playerList.getPlayers().iterator();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8d80161d23..76d7daee26 100644
+index 8d80161d2..76d7daee2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -59,6 +59,7 @@ import org.apache.logging.log4j.Level;
@@ -147,7 +147,7 @@ index 8d80161d23..76d7daee26 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index caab95f0fa..0e044ed950 100644
+index caab95f0f..0e044ed95 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -146,11 +146,13 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -205,7 +205,7 @@ index caab95f0fa..0e044ed950 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index bce7deb65c..74782ff5af 100644
+index bce7deb65..74782ff5a 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -171,6 +171,7 @@ import net.minecraft.world.level.storage.WorldDataServer;
@@ -282,7 +282,7 @@ index bce7deb65c..74782ff5af 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index a5795700ea..c43cad1579 100644
+index 52bbf842f..974e282cf 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -320,6 +320,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@@ -301,7 +301,7 @@ index a5795700ea..c43cad1579 100644
  
      }
  
-@@ -1964,6 +1966,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1965,6 +1967,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
      }
  
      private void handleCommand(String s) {
@@ -309,7 +309,7 @@ index a5795700ea..c43cad1579 100644
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
  
          CraftPlayer player = this.getCraftPlayer();
-@@ -1972,6 +1975,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1973,6 +1976,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
          this.cserver.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -317,7 +317,7 @@ index a5795700ea..c43cad1579 100644
              return;
          }
  
-@@ -1983,6 +1987,8 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1984,6 +1988,8 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
              player.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
@@ -327,7 +327,7 @@ index a5795700ea..c43cad1579 100644
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7f6c1c1975..b7a91c91f8 100644
+index fe029a4a0..d3ecf5ca7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -136,6 +136,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -363,7 +363,7 @@ index 7f6c1c1975..b7a91c91f8 100644
  
      private boolean isStateClimbable(IBlockData iblockdata) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 49a1697ab9..b8c112bcd8 100644
+index 49a1697ab..b8c112bcd 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -143,6 +143,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -444,7 +444,7 @@ index 49a1697ab9..b8c112bcd8 100644
          if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
              this.hurt(this.damageSources().drown(), 1.0F);
 diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
-index a8a2f3d293..a7526f3c0b 100644
+index a8a2f3d29..a7526f3c0 100644
 --- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
 @@ -117,6 +117,7 @@ public final class SpawnerCreature {
@@ -464,7 +464,7 @@ index a8a2f3d293..a7526f3c0b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 8610cb15f0..9b786aff08 100644
+index 8610cb15f..9b786aff0 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -88,6 +88,7 @@ import org.bukkit.Bukkit;
@@ -526,7 +526,7 @@ index 8610cb15f0..9b786aff08 100644
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
-index 78917dee2a..2567926c51 100644
+index 78917dee2..2567926c5 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
 @@ -21,8 +21,11 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
@@ -542,7 +542,7 @@ index 78917dee2a..2567926c51 100644
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
-index cb9b347b27..e36e39d993 100644
+index cb9b347b2..e36e39d99 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
 @@ -882,6 +882,7 @@ public class Chunk extends IChunkAccess {
@@ -565,7 +565,7 @@ index cb9b347b27..e36e39d993 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
-index 570f628549..c66df1e7a9 100644
+index 570f62854..c66df1e7a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
 @@ -483,10 +483,13 @@ public class ChunkRegionLoader {
@@ -591,10 +591,10 @@ index 570f628549..c66df1e7a9 100644
          };
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b453411c3f..37d0a21c75 100644
+index 24d5cead3..b303d8fab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2371,6 +2371,11 @@ public final class CraftServer implements Server {
+@@ -2432,6 +2432,11 @@ public final class CraftServer implements Server {
      private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
      {
  
@@ -608,7 +608,7 @@ index b453411c3f..37d0a21c75 100644
      public org.bukkit.Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 new file mode 100644
-index 0000000000..aff7b6b438
+index 000000000..aff7b6b43
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 @@ -0,0 +1,160 @@
@@ -773,7 +773,7 @@ index 0000000000..aff7b6b438
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 1fb9b4582e..e90ec26a0c 100644
+index d7da2a0b5..af7d26019 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -411,7 +411,9 @@ public class CraftScheduler implements BukkitScheduler {
@@ -787,7 +787,7 @@ index 1fb9b4582e..e90ec26a0c 100644
                      task.getOwner().getLogger().log(
                              Level.WARNING,
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index c885bc7443..70794669ff 100644
+index c885bc744..70794669f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -5,7 +5,10 @@ import org.bukkit.Bukkit;
diff --git a/CraftBukkit-Patches/0017-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0017-Allow-Disabling-of-Command-Logging.patch
index d65154ba..260c0baa 100644
--- a/CraftBukkit-Patches/0017-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0017-Allow-Disabling-of-Command-Logging.patch
@@ -1,14 +1,14 @@
-From 69234b41325631969ae4ddb050523e79249749f8 Mon Sep 17 00:00:00 2001
+From 5a69c5ac5fe2cdd41b182e60c5ac38f2cc60716f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index c43cad1579..403ce225d7 100644
+index 974e282cf..59eda93a1 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1967,6 +1967,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1968,6 +1968,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
  
      private void handleCommand(String s) {
          org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
@@ -17,7 +17,7 @@ index c43cad1579..403ce225d7 100644
  
          CraftPlayer player = this.getCraftPlayer();
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 7f14cbc63b..bc9fbcc584 100644
+index 7f14cbc63..bc9fbcc58 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -150,4 +150,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch
index 781774b5..e581c604 100644
--- a/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0018-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,11 +1,11 @@
-From fef80c97014730b29c4c4fe3dd6a63495241c187 Mon Sep 17 00:00:00 2001
+From fe78629e47ec11c6476f1c9041859fc14513a98a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index 5a4d3a494a..64d43456bb 100644
+index 5a4d3a494..64d43456b 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
 @@ -379,6 +379,7 @@ public class CommandDispatcher {
@@ -25,10 +25,10 @@ index 5a4d3a494a..64d43456bb 100644
              if (commandnode2.canUse(commandlistenerwrapper)) {
                  ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 37d0a21c75..21cd7f66df 100644
+index b303d8fab..004be8656 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2016,6 +2016,13 @@ public final class CraftServer implements Server {
+@@ -2077,6 +2077,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {
@@ -43,7 +43,7 @@ index 37d0a21c75..21cd7f66df 100644
          try {
              if (message.startsWith("/")) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index bc9fbcc584..fc352ecf10 100644
+index bc9fbcc58..fc352ecf1 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -156,4 +156,23 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0021-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0021-Disallow-Interaction-With-Self.patch
index 614194d3..34b09f54 100644
--- a/CraftBukkit-Patches/0021-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0021-Disallow-Interaction-With-Self.patch
@@ -1,14 +1,14 @@
-From 5c8e3bccc9d00b4c40fefa9f24baf9c8a736e2ca Mon Sep 17 00:00:00 2001
+From e2bd6b507063bc4e3490b1d5bcfeeb6d4452874c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 403ce225d7..23a15db7e1 100644
+index 59eda93a1..0a06817f1 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -2221,6 +2221,13 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -2222,6 +2222,13 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
          if (this.player.isImmobile()) return; // CraftBukkit
          final WorldServer worldserver = this.player.serverLevel();
          final Entity entity = packetplayinuseentity.getTarget(worldserver);
diff --git a/CraftBukkit-Patches/0025-Implement-respawn-API.patch b/CraftBukkit-Patches/0025-Implement-respawn-API.patch
index 4487ce4f..fd2783ff 100644
--- a/CraftBukkit-Patches/0025-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0025-Implement-respawn-API.patch
@@ -1,14 +1,14 @@
-From 111e8c50b878c008509a08a7ed2707d8aa3683fd Mon Sep 17 00:00:00 2001
+From 07cfff1107cc5d303c183243138b4baf0fc69ed5 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b4477e693c..3f55e81485 100644
+index 539ba62c5..57d4ffbdc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2158,6 +2158,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2160,6 +2160,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {
diff --git a/CraftBukkit-Patches/0027-Watchdog-Thread.patch b/CraftBukkit-Patches/0027-Watchdog-Thread.patch
index d960ad5c..28b527d9 100644
--- a/CraftBukkit-Patches/0027-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0027-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From 882bb27bd852d76461ca0ed0cf2d23807915b2cd Mon Sep 17 00:00:00 2001
+From 0cce51b1820c134fcc5c2a42059a6714211f1304 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a7171e995e..977e2c6fa3 100644
+index a7171e995..977e2c6fa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -996,6 +996,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -25,7 +25,7 @@ index a7171e995e..977e2c6fa3 100644
          org.spigotmc.CustomTimingsHandler.tick(); // Spigot
      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 76d7daee26..b40e34e819 100644
+index 76d7daee2..b40e34e81 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -259,7 +259,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -38,10 +38,10 @@ index 76d7daee26..b40e34e819 100644
  
                  thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ea82d0105..94f673682a 100644
+index dfdaa9570..b79f9163b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1978,7 +1978,7 @@ public final class CraftServer implements Server {
+@@ -2039,7 +2039,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -50,7 +50,7 @@ index 3ea82d0105..94f673682a 100644
      }
  
      @Override
-@@ -2383,6 +2383,11 @@ public final class CraftServer implements Server {
+@@ -2444,6 +2444,11 @@ public final class CraftServer implements Server {
          {
              return org.spigotmc.SpigotConfig.config;
          }
@@ -64,7 +64,7 @@ index 3ea82d0105..94f673682a 100644
      public org.bukkit.Server.Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 0000000000..3f739e80ed
+index 000000000..3f739e80e
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +1,130 @@
@@ -199,7 +199,7 @@ index 0000000000..3f739e80ed
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 8ad8b25894..130016282a 100644
+index 8ad8b2589..130016282 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -200,4 +200,18 @@ public class SpigotConfig
@@ -223,7 +223,7 @@ index 8ad8b25894..130016282a 100644
  }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
 new file mode 100644
-index 0000000000..4734d4ae83
+index 000000000..4734d4ae8
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +1,131 @@
diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
index 3a99decb..30bd8063 100644
--- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From ecf9e8d26dd12ccfc9ce2040f8158148cc580fd5 Mon Sep 17 00:00:00 2001
+From 8e32681c2477dcccd96df56b2cec81a18a34c020 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -139,10 +139,10 @@ index 6f1d3a94d..8c55672b1 100644
  
      private static enum EnumProtocolState {
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index cb346fff8..f4df3a902 100644
+index 393b44d7b..99f19c0dc 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1924,7 +1924,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1925,7 +1925,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
  
                          String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
                          if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
@@ -151,7 +151,7 @@ index cb346fff8..f4df3a902 100644
                                  PlayerConnection.this.server.getPlayerList().broadcastChatMessage(original, PlayerConnection.this.player, ChatMessageType.bind(ChatMessageType.CHAT, (Entity) PlayerConnection.this.player));
                                  return null;
                              }
-@@ -1960,7 +1960,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1961,7 +1961,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
  
                  s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
@@ -160,7 +160,7 @@ index cb346fff8..f4df3a902 100644
                          PlayerConnection.this.server.getPlayerList().broadcastChatMessage(original, PlayerConnection.this.player, ChatMessageType.bind(ChatMessageType.CHAT, (Entity) PlayerConnection.this.player));
                          return;
                      }
-@@ -2217,6 +2217,13 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -2218,6 +2218,13 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
          return this.connection.getRemoteAddress();
      }
  
@@ -175,7 +175,7 @@ index cb346fff8..f4df3a902 100644
          this.waitingForSwitchToConfig = true;
          this.removePlayerFromWorld();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 24d3bd8aa..2dd66075d 100644
+index 2f9ab04ae..185bd9f55 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -584,7 +584,7 @@ public abstract class PlayerList {
@@ -188,7 +188,7 @@ index 24d3bd8aa..2dd66075d 100644
          if (getBans().isBanned(gameprofile) && !getBans().get(gameprofile).hasExpired()) {
              GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0bba259c9..d9d5857ca 100644
+index b79f9163b..4868f4a06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -759,7 +759,13 @@ public final class CraftServer implements Server {
@@ -207,10 +207,10 @@ index 0bba259c9..d9d5857ca 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4c9d5ec06..f14d4d953 100644
+index 57d4ffbdc..41874a4b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2159,6 +2159,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2161,6 +2161,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private final Player.Spigot spigot = new Player.Spigot()
      {
  
diff --git a/CraftBukkit-Patches/0043-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0043-Spam-Filter-Exclusions.patch
index 9ff52dc0..2be6eeba 100644
--- a/CraftBukkit-Patches/0043-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0043-Spam-Filter-Exclusions.patch
@@ -1,14 +1,14 @@
-From aeefd2322859ee029829741bbde882b45ed8c9ce Mon Sep 17 00:00:00 2001
+From 15fff62654a859e7c1f4054b1f5861f3359c9538 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index f4df3a902e..af3ee9d5ae 100644
+index 99f19c0dc..fddc93796 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1766,7 +1766,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1767,7 +1767,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
                      // CraftBukkit end
  
                      this.performChatCommand(serverboundchatcommandpacket, (LastSeenMessages) optional.get());
@@ -17,7 +17,7 @@ index f4df3a902e..af3ee9d5ae 100644
                  });
              }
  
-@@ -2033,11 +2033,22 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -2034,11 +2034,22 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
          }
          // this.server.getPlayerList().broadcastChatMessage(playerchatmessage, this.player, ChatMessageType.bind(ChatMessageType.CHAT, (Entity) this.player));
          // CraftBukkit end
@@ -43,7 +43,7 @@ index f4df3a902e..af3ee9d5ae 100644
          if (this.chatSpamTickCount.addAndGet(20) > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
              // CraftBukkit end
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index cf7c624bc5..4f9b55c713 100644
+index cf7c624bc..4f9b55c71 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,7 @@ import java.io.IOException;
diff --git a/CraftBukkit-Patches/0045-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0045-Add-support-for-fetching-hidden-players.patch
index 154b9dd0..40033f1d 100644
--- a/CraftBukkit-Patches/0045-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0045-Add-support-for-fetching-hidden-players.patch
@@ -1,14 +1,14 @@
-From 29a2d0b8a81ac65fc0ba76646c52051943f08f91 Mon Sep 17 00:00:00 2001
+From 2d1f0b8b1ab76a532d611712523db636e8b303fe Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 87e5d84494..50d9c44e65 100644
+index 68ed49375..a1fb14b72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2173,6 +2173,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2175,6 +2175,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  server.getServer().getPlayerList().respawn( getHandle(), false, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.PLUGIN );
              }
          }
diff --git a/CraftBukkit-Patches/0047-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0047-Implement-Silenceable-Lightning-API.patch
index 99cf56db..a6d755f2 100644
--- a/CraftBukkit-Patches/0047-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0047-Implement-Silenceable-Lightning-API.patch
@@ -1,11 +1,11 @@
-From d92a3ce729cb95acbc0bcf49fae01ca8323723cb Mon Sep 17 00:00:00 2001
+From 612211fdaaad4f85c6e89dac8092365a1e356f0c Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLightning.java b/src/main/java/net/minecraft/world/entity/EntityLightning.java
-index 5fae741e71..ecba56d2ec 100644
+index 5fae741e7..ecba56d2e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLightning.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLightning.java
 @@ -46,6 +46,7 @@ public class EntityLightning extends Entity {
@@ -26,10 +26,10 @@ index 5fae741e71..ecba56d2ec 100644
                  this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
                  this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0a509f85f5..c93ef5bb3d 100644
+index bbce80b7b..27399bc38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1971,6 +1971,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1973,6 +1973,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
      {
@@ -58,7 +58,7 @@ index 0a509f85f5..c93ef5bb3d 100644
  
      public org.bukkit.World.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index 3a68e1cf5c..6a0f238060 100644
+index 3a68e1cf5..6a0f23806 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 @@ -54,6 +54,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
diff --git a/CraftBukkit-Patches/0061-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0061-Limit-block-placement-interaction-packets.patch
index 0559d728..d89e423c 100644
--- a/CraftBukkit-Patches/0061-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0061-Limit-block-placement-interaction-packets.patch
@@ -1,11 +1,11 @@
-From 7dcd57b0788a48eded673f5b12feece5699be7f7 Mon Sep 17 00:00:00 2001
+From 586b66959a49ed1ac2311a9aecbda205b8dc5a06 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
-index 74612f5f7b..afec33eef4 100644
+index 74612f5f7..afec33eef 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
 @@ -9,6 +9,7 @@ public class PacketPlayInBlockPlace implements Packet<PacketListenerPlayIn> {
@@ -25,7 +25,7 @@ index 74612f5f7b..afec33eef4 100644
          this.sequence = packetdataserializer.readVarInt();
      }
 diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
-index 675909dc64..44ed8f10d4 100644
+index 675909dc6..44ed8f10d 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
 @@ -11,6 +11,7 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
@@ -45,10 +45,10 @@ index 675909dc64..44ed8f10d4 100644
          this.blockHit = packetdataserializer.readBlockHitResult();
          this.sequence = packetdataserializer.readVarInt();
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index af3ee9d5ae..6e03d9e6f8 100644
+index fddc93796..d610d6fd7 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1498,10 +1498,30 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1499,10 +1499,30 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
          }
      }
  
@@ -79,7 +79,7 @@ index af3ee9d5ae..6e03d9e6f8 100644
          this.player.connection.ackBlockChangesUpTo(packetplayinuseitem.getSequence());
          WorldServer worldserver = this.player.serverLevel();
          EnumHand enumhand = packetplayinuseitem.getHand();
-@@ -1555,6 +1575,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1556,6 +1576,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
      public void handleUseItem(PacketPlayInBlockPlace packetplayinblockplace) {
          PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinblockplace, this, this.player.serverLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
diff --git a/CraftBukkit-Patches/0063-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0063-Further-Seed-Customisation.patch
index e7f692e3..aaab711e 100644
--- a/CraftBukkit-Patches/0063-Further-Seed-Customisation.patch
+++ b/CraftBukkit-Patches/0063-Further-Seed-Customisation.patch
@@ -1,4 +1,4 @@
-From 462aacd476872dc37d5e614da513366bcdc4fd53 Mon Sep 17 00:00:00 2001
+From 00b44278c0e1cdefff13edb3636a3c58d2208b14 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation
@@ -170,10 +170,10 @@ index 6d6b3abd1..926848b82 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 08aac8734..2e18c0b3e 100644
+index 96144bab2..9c594767a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -216,7 +216,7 @@ public class CraftChunk implements Chunk {
+@@ -217,7 +217,7 @@ public class CraftChunk implements Chunk {
      @Override
      public boolean isSlimeChunk() {
          // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
diff --git a/CraftBukkit-Patches/0067-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0067-Make-moved-wrongly-limit-configurable.patch
index 42fd5e6c..8153d26f 100644
--- a/CraftBukkit-Patches/0067-Make-moved-wrongly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0067-Make-moved-wrongly-limit-configurable.patch
@@ -1,11 +1,11 @@
-From 3e5e14efcbff725bc254d5fa17740783ca1907d0 Mon Sep 17 00:00:00 2001
+From df4a88a2ff8ed48d0c8727de1cd69b643e96b857 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 6e03d9e6f8..1041d8f870 100644
+index d610d6fd7..bd74d09a7 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -538,7 +538,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@@ -17,7 +17,7 @@ index 6e03d9e6f8..1041d8f870 100644
                      flag2 = true;
                      PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
                  }
-@@ -1214,7 +1214,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1215,7 +1215,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
                              d10 = d6 * d6 + d7 * d7 + d8 * d8;
                              boolean flag2 = false;
  
@@ -27,7 +27,7 @@ index 6e03d9e6f8..1041d8f870 100644
                                  PlayerConnection.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
                              }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 3540e2dafb..9e34d30271 100644
+index 3540e2daf..9e34d3027 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -326,4 +326,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0068-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0068-Make-moved-too-quickly-limit-configurable.patch
index af319b4f..f59dc103 100644
--- a/CraftBukkit-Patches/0068-Make-moved-too-quickly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0068-Make-moved-too-quickly-limit-configurable.patch
@@ -1,11 +1,11 @@
-From 730d5ceceb5c093c173981acde4121b55c95ff19 Mon Sep 17 00:00:00 2001
+From 6f7cc473febf1bd892267feca1d1a14b77856635 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 1041d8f870..d21836f630 100644
+index bd74d09a7..cf07413ae 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -503,7 +503,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@@ -17,7 +17,7 @@ index 1041d8f870..d21836f630 100644
                  // CraftBukkit end
                      PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", new Object[]{entity.getName().getString(), this.player.getName().getString(), d6, d7, d8});
                      this.send(new PacketPlayOutVehicleMove(entity));
-@@ -1179,7 +1179,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -1180,7 +1180,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
                              if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
                                  float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
  
@@ -27,7 +27,7 @@ index 1041d8f870..d21836f630 100644
                                      PlayerConnection.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8});
                                      this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9e34d30271..08f6ef8d48 100644
+index 9e34d3027..08f6ef8d4 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -332,4 +332,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0071-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0071-Only-fetch-an-online-UUID-in-online-mode.patch
index 20d592e1..bbbc4936 100644
--- a/CraftBukkit-Patches/0071-Only-fetch-an-online-UUID-in-online-mode.patch
+++ b/CraftBukkit-Patches/0071-Only-fetch-an-online-UUID-in-online-mode.patch
@@ -1,4 +1,4 @@
-From 8af6852e894694bc79f06347db09dbf9a99db22d Mon Sep 17 00:00:00 2001
+From 0e6c88a5e10b0508d00e8888efe401c5c6c1aa63 Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode
@@ -12,10 +12,10 @@ You want to store data for player "Test"  who never joined. An online UUID is cr
 The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a9542d1bc3..69d2d47d4e 100644
+index 569c4f566..1e9f77956 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1674,8 +1674,14 @@ public final class CraftServer implements Server {
+@@ -1735,8 +1735,14 @@ public final class CraftServer implements Server {
  
          OfflinePlayer result = getPlayerExact(name);
          if (result == null) {
diff --git a/CraftBukkit-Patches/0078-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0078-BungeeCord-Chat-API.patch
index d854fbd3..5f002898 100644
--- a/CraftBukkit-Patches/0078-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0078-BungeeCord-Chat-API.patch
@@ -1,11 +1,11 @@
-From de2b7717f63cad937234f88bb7a5be047825f1a4 Mon Sep 17 00:00:00 2001
+From 340c9aa1c71acb6ad71d573abf28b21ccf24cfa1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 03:06:05 +0100
 Subject: [PATCH] BungeeCord Chat API
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
-index b5a12f0de3..03a73f00f6 100644
+index b5a12f0de..03a73f00f 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
 @@ -5,7 +5,17 @@ import net.minecraft.network.PacketDataSerializer;
@@ -37,7 +37,7 @@ index b5a12f0de3..03a73f00f6 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 69d2d47d4e..87331fd1b0 100644
+index 1e9f77956..00df9b3d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -265,6 +265,8 @@ import org.yaml.snakeyaml.Yaml;
@@ -49,7 +49,7 @@ index 69d2d47d4e..87331fd1b0 100644
  public final class CraftServer implements Server {
      private final String serverName = "CraftBukkit";
      private final String serverVersion;
-@@ -2412,6 +2414,20 @@ public final class CraftServer implements Server {
+@@ -2473,6 +2475,20 @@ public final class CraftServer implements Server {
          public void restart() {
              org.spigotmc.RestartCommand.restart();
          }
@@ -71,7 +71,7 @@ index 69d2d47d4e..87331fd1b0 100644
  
      public org.bukkit.Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-index 74558e852e..13008357b4 100644
+index 74558e852..13008357b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 @@ -103,6 +103,29 @@ public abstract class ServerCommandSender implements CommandSender {
@@ -105,7 +105,7 @@ index 74558e852e..13008357b4 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index efd781c34a..8ce861ac00 100644
+index 1e6b8dec5..14e465868 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -196,6 +196,8 @@ import org.bukkit.util.BoundingBox;
@@ -145,7 +145,7 @@ index efd781c34a..8ce861ac00 100644
  
      public org.bukkit.entity.Entity.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4773376593..47b935797a 100644
+index 4311aa4ba..df4f86073 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -180,6 +180,8 @@ import org.bukkit.profile.PlayerProfile;
@@ -157,7 +157,7 @@ index 4773376593..47b935797a 100644
  @DelegateDeserialization(CraftOfflinePlayer.class)
  public class CraftPlayer extends CraftHumanEntity implements Player {
      private long firstPlayed = 0;
-@@ -2196,6 +2198,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2198,6 +2200,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              return java.util.Collections.unmodifiableSet( ret );
          }
@@ -207,7 +207,7 @@ index 4773376593..47b935797a 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index dfde2c619c..4a94655108 100644
+index dfde2c619..4a9465510 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -22,6 +22,9 @@ import org.bukkit.inventory.meta.BookMeta;
diff --git a/CraftBukkit-Patches/0083-Add-creative-mode-NBT-permissions.patch b/CraftBukkit-Patches/0083-Add-creative-mode-NBT-permissions.patch
index a62841e6..971a45f1 100644
--- a/CraftBukkit-Patches/0083-Add-creative-mode-NBT-permissions.patch
+++ b/CraftBukkit-Patches/0083-Add-creative-mode-NBT-permissions.patch
@@ -1,11 +1,11 @@
-From 864480337dc731a0f37932791907a8d27bec2143 Mon Sep 17 00:00:00 2001
+From 6ca5972b04169455ef080cf137e492ba91a2d554 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 25 Feb 2019 19:26:56 +1100
 Subject: [PATCH] Add creative mode NBT permissions
 
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-index 8d054c4084..e85e929546 100644
+index 8d054c408..e85e92954 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
 @@ -202,6 +202,14 @@ public class PlayerInteractManager {
@@ -24,10 +24,10 @@ index 8d054c4084..e85e929546 100644
                      this.player.connection.send(new PacketPlayOutBlockChange(blockposition, this.level.getBlockState(blockposition)));
                      this.debugLogging(blockposition, false, j, "block action restricted");
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index d21836f630..409be13eb2 100644
+index cf07413ae..bcf339908 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -2799,7 +2799,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
+@@ -2800,7 +2800,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
  
              NBTTagCompound nbttagcompound = ItemBlock.getBlockEntityData(itemstack);
  
@@ -37,7 +37,7 @@ index d21836f630..409be13eb2 100644
  
                  if (this.player.level().isLoaded(blockposition)) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemBlock.java b/src/main/java/net/minecraft/world/item/ItemBlock.java
-index d740bd14a9..386f22dfb5 100644
+index d740bd14a..386f22dfb 100644
 --- a/src/main/java/net/minecraft/world/item/ItemBlock.java
 +++ b/src/main/java/net/minecraft/world/item/ItemBlock.java
 @@ -230,7 +230,7 @@ public class ItemBlock extends Item {
@@ -50,7 +50,7 @@ index d740bd14a9..386f22dfb5 100644
                      }
  
 diff --git a/src/main/java/net/minecraft/world/item/ItemDebugStick.java b/src/main/java/net/minecraft/world/item/ItemDebugStick.java
-index 1770955890..fb59e6dfa8 100644
+index 177095589..fb59e6dfa 100644
 --- a/src/main/java/net/minecraft/world/item/ItemDebugStick.java
 +++ b/src/main/java/net/minecraft/world/item/ItemDebugStick.java
 @@ -57,7 +57,7 @@ public class ItemDebugStick extends Item {
@@ -63,7 +63,7 @@ index 1770955890..fb59e6dfa8 100644
          } else {
              Block block = iblockdata.getBlock();
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-index 75f8d47a20..525ebf961e 100644
+index 75f8d47a2..525ebf961 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 @@ -11,6 +11,12 @@ public final class CraftDefaultPermissions {