diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index 16a3fe2e8..de20d40d3 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,11 +1,11 @@
-From ce4b2215cf8f7b774ee8066d8a8d0b07bd54d999 Mon Sep 17 00:00:00 2001
+From 92a7df9172f5671afa9c3f2baa8c7652294f6134 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
 
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index c3e990bdf..e2a7b4be2 100644
+index c3e990bdff..e2a7b4be2c 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -93,7 +93,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -18,7 +18,7 @@ index c3e990bdf..e2a7b4be2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 9f3aa2459..7dbea9090 100644
+index 9f3aa24590..7dbea90902 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -10,7 +10,6 @@ import org.apache.logging.log4j.Logger;
@@ -54,7 +54,7 @@ index 9f3aa2459..7dbea9090 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 411ab6061..cd4fbee0c 100644
+index 411ab6061b..cd4fbee0ca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -28,7 +28,7 @@ import com.google.common.collect.Lists; // CraftBukkit
@@ -75,7 +75,7 @@ index 411ab6061..cd4fbee0c 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 00a530c51..2947d9ff6 100644
+index 00a530c51c..2947d9ff6a 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 {
@@ -88,7 +88,7 @@ index 00a530c51..2947d9ff6 100644
          return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index ca2a14d7a..9a513b4e3 100644
+index ca2a14d7ac..9a513b4e3a 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;
@@ -131,18 +131,18 @@ index ca2a14d7a..9a513b4e3 100644
          private boolean c = true;
          private boolean d = true;
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index f5e311f2a..cf679df7b 100644
+index 0d26fc56dd..e7b5daf28e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -25,6 +25,7 @@ import org.bukkit.Location;
- import org.bukkit.TreeType;
+@@ -26,6 +26,7 @@ import org.bukkit.TreeType;
  import org.bukkit.block.BlockState;
+ import org.bukkit.craftbukkit.block.CraftBlock;
  import org.bukkit.craftbukkit.block.CraftBlockState;
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
  import org.bukkit.craftbukkit.util.CraftMagicNumbers;
  import org.bukkit.entity.Player;
- import org.bukkit.event.world.StructureGrowEvent;
-@@ -551,6 +552,17 @@ public final class ItemStack {
+ import org.bukkit.event.block.BlockFertilizeEvent;
+@@ -555,6 +556,17 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList();
      }
  
@@ -161,7 +161,7 @@ index f5e311f2a..cf679df7b 100644
          this.tag = nbttagcompound;
      }
 diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
-index a540167d6..add618866 100644
+index a540167d6d..add618866b 100644
 --- a/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 @@ -85,11 +85,11 @@ public abstract class LotoSelectorEntry {
@@ -180,7 +180,7 @@ index a540167d6..add618866 100644
      }
 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..70cdc3f10
+index 0000000000..70cdc3f102
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +1,292 @@
@@ -477,7 +477,7 @@ index 000000000..70cdc3f10
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java
-index 8170a8428..e21e60b00 100644
+index 8170a84280..e21e60b003 100644
 --- a/src/main/java/net/minecraft/server/NBTBase.java
 +++ b/src/main/java/net/minecraft/server/NBTBase.java
 @@ -20,7 +20,7 @@ public interface NBTBase {
@@ -499,7 +499,7 @@ index 8170a8428..e21e60b00 100644
          case 0:
              return "TAG_End";
 diff --git a/src/main/java/net/minecraft/server/NBTList.java b/src/main/java/net/minecraft/server/NBTList.java
-index 1a81d8e5f..057c2077a 100644
+index 1a81d8e5f6..057c2077a0 100644
 --- a/src/main/java/net/minecraft/server/NBTList.java
 +++ b/src/main/java/net/minecraft/server/NBTList.java
 @@ -13,7 +13,7 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
@@ -525,7 +525,7 @@ index 1a81d8e5f..057c2077a 100644
 +    public abstract NBTList<T> clone(); // Paper - decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
-index 11ffa6c34..3ff3a2983 100644
+index 11ffa6c342..3ff3a29835 100644
 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 @@ -66,7 +66,8 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
@@ -539,7 +539,7 @@ index 11ffa6c34..3ff3a2983 100644
  
          System.arraycopy(this.data, 0, abyte, 0, this.data.length);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 7fc9b5ff3..e658816c2 100644
+index 7fc9b5ff32..e658816c24 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -24,7 +24,7 @@ public class NBTTagCompound implements NBTBase {
@@ -575,7 +575,7 @@ index 7fc9b5ff3..e658816c2 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
-index f5c9b97d5..d121ad4f7 100644
+index f5c9b97d5c..d121ad4f7a 100644
 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 @@ -132,7 +132,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
@@ -588,7 +588,7 @@ index f5c9b97d5..d121ad4f7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b3c944d70..a8280acf9 100644
+index b3c944d701..a8280acf94 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -14,7 +14,7 @@ import org.apache.logging.log4j.Logger;
@@ -626,7 +626,7 @@ index b3c944d70..a8280acf9 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0618962e7..42e0630e6 100644
+index 0618962e75..42e0630e60 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -66,9 +66,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -643,7 +643,7 @@ index 0618962e7..42e0630e6 100644
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index ef332d651..7cc7eb773 100644
+index ef332d6517..7cc7eb7735 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -8,7 +8,7 @@ import java.util.Iterator;
@@ -665,7 +665,7 @@ index ef332d651..7cc7eb773 100644
  
          this.c.set(i, t0);
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 2179664a0..d7e1ecc03 100644
+index 2179664a0c..d7e1ecc031 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -102,11 +102,11 @@ public class ServerPing {
@@ -711,5 +711,5 @@ index 2179664a0..d7e1ecc03 100644
              }
          }
 -- 
-2.16.1.windows.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
index e1ee4ac1d..f7c7d34cc 100644
--- a/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From e840becdb579c898f7026e614c92b348b3b6a31f Mon Sep 17 00:00:00 2001
+From 8a48c219a19b1af517a7c92351f522421411241a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index cf679df7b..405b867fe 100644
+index e7b5daf28e..6e7b2e721d 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;
@@ -30,7 +30,7 @@ index cf679df7b..405b867fe 100644
  import java.util.Locale;
  import java.util.Objects;
  import java.util.Random;
-@@ -54,6 +56,22 @@ public final class ItemStack {
+@@ -56,6 +58,22 @@ public final class ItemStack {
          decimalformat.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT));
          return decimalformat;
      }
@@ -53,7 +53,7 @@ index cf679df7b..405b867fe 100644
  
      public ItemStack(IMaterial imaterial) {
          this(imaterial, 1);
-@@ -96,6 +114,7 @@ public final class ItemStack {
+@@ -98,6 +116,7 @@ public final class ItemStack {
          if (nbttagcompound.hasKeyOfType("tag", 10)) {
              // CraftBukkit start - make defensive copy as this data may be coming from the save thread
              this.tag = (NBTTagCompound) nbttagcompound.getCompound("tag").clone();
@@ -61,7 +61,7 @@ index cf679df7b..405b867fe 100644
              this.getItem().a(this.tag);
              // CraftBukkit end
          }
-@@ -565,6 +584,7 @@ public final class ItemStack {
+@@ -569,6 +588,7 @@ public final class ItemStack {
      // Paper end
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
@@ -69,7 +69,7 @@ index cf679df7b..405b867fe 100644
      }
  
      public IChatBaseComponent getName() {
-@@ -641,6 +661,7 @@ public final class ItemStack {
+@@ -645,6 +665,7 @@ public final class ItemStack {
          nbttagcompound.setString("id", String.valueOf(Enchantment.enchantments.b(enchantment)));
          nbttagcompound.setShort("lvl", (short) ((byte) i));
          nbttaglist.add((NBTBase) nbttagcompound);
@@ -78,7 +78,7 @@ index cf679df7b..405b867fe 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 f4672b9a4..e2699564a 100644
+index f4672b9a48..e2699564af 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;
@@ -204,7 +204,7 @@ index f4672b9a4..e2699564a 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 f10de8550..f21c1e846 100644
+index f10de8550c..f21c1e846d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -8,12 +8,14 @@ import java.lang.reflect.Constructor;
diff --git a/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
index 06a5090fb..071e6161d 100644
--- a/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From 5932dddd728efb8aad079283e90ce638dfe95471 Mon Sep 17 00:00:00 2001
+From 1462c435b911a715894e8eeb1e3974b90d2263c6 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 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 a22f4c55e9..b6e8296824 100644
+index eb936a0445..fae8a13973 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -93,6 +93,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -32,7 +32,7 @@ index a22f4c55e9..b6e8296824 100644
                  @Override
                  public void run() {
                      try {
-@@ -182,7 +188,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -181,7 +187,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
                          server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + i.getName(), ex);
                      }
                  }
@@ -42,7 +42,7 @@ index a22f4c55e9..b6e8296824 100644
              // Spigot end
          }
  
-@@ -198,7 +205,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -197,7 +204,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
              this.loginKey = packetlogininencryptionbegin.a(privatekey);
              this.g = LoginListener.EnumProtocolState.AUTHENTICATING;
              this.networkManager.a(this.loginKey);
@@ -52,7 +52,7 @@ index a22f4c55e9..b6e8296824 100644
                  public void run() {
                      GameProfile gameprofile = LoginListener.this.i;
  
-@@ -245,10 +253,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -244,10 +252,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
  
                      return LoginListener.this.server.U() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null;
                  }
diff --git a/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
index 72003cc74..143e6e46e 100644
--- a/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 4dc090c70a0b01357032d2293e26ecb341779756 Mon Sep 17 00:00:00 2001
+From 766b2224cc263eb3f5d84aedae774f89cc97afdc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,10 +6,10 @@ 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 e120521611..023dd48a23 100644
+index 6e7b2e721d..33e82f5377 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -140,7 +140,7 @@ public final class ItemStack {
+@@ -142,7 +142,7 @@ public final class ItemStack {
      }
  
      public boolean isEmpty() {
diff --git a/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
index 479b7671b..8204ff50c 100644
--- a/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 0b0a3e748bda1f720b5c63af9d9175550f43232f Mon Sep 17 00:00:00 2001
+From 2b552c360f4a543cadc543d179f25a88f4ccd3e7 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 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 329950802..7a2c70302 100644
+index 329950802f..7a2c703022 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,10 +27,10 @@ index 329950802..7a2c70302 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 85eff6e2d..3464af679 100644
+index 005efbc111..6249b0e686 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
-@@ -241,6 +241,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -240,6 +240,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
                              LoginListener.this.i = LoginListener.this.a(gameprofile);
                              LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
                          } else {
diff --git a/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 05211c3e8..36c2cf430 100644
--- a/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From efacdfe905c6b465963472f725db2690aa1290d8 Mon Sep 17 00:00:00 2001
+From dbf5e0efaf13ef601966eafd9c58768f22b17f2d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 ae10cd89c1..a721eb30e9 100644
+index 91cd6e0f61..f02b28059c 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
@@ -25,7 +25,7 @@ index ae10cd89c1..a721eb30e9 100644
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
  import org.bukkit.event.player.PlayerPreLoginEvent;
-@@ -281,8 +284,16 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -280,8 +283,16 @@ public class LoginListener implements PacketLoginInListener, ITickable {
                              java.util.UUID uniqueId = i.getId();
                              final org.bukkit.craftbukkit.CraftServer server = LoginListener.this.server.server;
  
diff --git a/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
index ac40b7d8a..588fd570c 100644
--- a/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 41b4ebc08ef0a4929b0564d18d68cc105280bf85 Mon Sep 17 00:00:00 2001
+From 854b7ae7e7fdb222ab2b685b8e00dd22a44d5e54 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 d04f9b380..5015bd071 100644
+index d04f9b380e..5015bd0710 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -67,7 +67,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index d04f9b380..5015bd071 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 a721eb30e..258bdfe66 100644
+index f02b28059c..bb33cf3029 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -38,7 +38,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -31,7 +31,7 @@ index a721eb30e..258bdfe66 100644
      private final String j;
      private SecretKey loginKey;
      private EntityPlayer l;
-@@ -285,12 +285,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -284,12 +284,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
                              final org.bukkit.craftbukkit.CraftServer server = LoginListener.this.server.server;
  
                              // Paper start
@@ -48,7 +48,7 @@ index a721eb30e..258bdfe66 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 9f69000cb..8313c5192 100644
+index 9f69000cb2..8313c5192b 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/0268-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
index b82c25127..faf35d83a 100644
--- a/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 2e865fce8dd06dc0afb86b40b01167f00593e59e Mon Sep 17 00:00:00 2001
+From 3413e0db563571a6aed48adddd2597b9aff71561 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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 e71d75a77..3c7a40c23 100644
+index 33e82f5377..0952bf0b82 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -512,6 +512,7 @@ public final class ItemStack {
+@@ -516,6 +516,7 @@ public final class ItemStack {
          this.getItem().b(this, world, entityhuman);
      }
  
@@ -18,7 +18,7 @@ index e71d75a77..3c7a40c23 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 aad380c3b..5f3331de1 100644
+index aad380c3b7..5f3331de13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -183,6 +183,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/work/Bukkit b/work/Bukkit
index 3607913ca..c520a9602 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 3607913caf81560ff9e809aba8e6fcbfebab4d02
+Subproject commit c520a96024beeb557ebccbc0f18a938a232635a1
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 1ef1ffd66..e70d864f0 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1ef1ffd664b55d9dc9800023182c779daff2594a
+Subproject commit e70d864f0063ccc5939ead10db5cc1fb6991fdf8
diff --git a/work/Spigot b/work/Spigot
index 0b44fa0bd..f68f5a825 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 0b44fa0bd4ed14ac6ae791d7f9a486d31382a0c7
+Subproject commit f68f5a82539faf7fb36f64bd72731e35d3e57cc3