Merge branch 'master' into ver/1.14

Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch

@@ -1,4 +1,4 @@
-From b969c7eaa41704ba0fdc242a143211138dc6af72 Mon Sep 17 00:00:00 2001
+From 6a69a46b9c475579cb79d20cbe7254763926b6e4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message

Spigot-Server-Patches/0318-Don-t-recheck-type-after-setting-a-block.patch

@@ -1,33 +0,0 @@
-From fbb9db3eb40780e9f85960b1456530c14a945fae Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 28 Sep 2018 22:27:33 -0400
-Subject: [PATCH] Don't recheck type after setting a block
-
-The server does a "Did my update succeed" check after setting
-a blocks data to a chunk.
-
-However, writes can not fail outside of a hard error or a
-a race condition from multiple threads writing, which is
-not something that should ever occur on the server.
-
-So this check is pointless, as if it did occur, the server would
-be having data corruption issues anyways.
-
-This provides a small boost to all setType calls.
-
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 836b012474..12f0fe618d 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -332,7 +332,7 @@ public class Chunk implements IChunkAccess {
-                 this.world.removeTileEntity(blockposition);
-             }
- 
--            if (chunksection.getType(i, j & 15, k).getBlock() != block) {
-+            if (false && chunksection.getType(i, j & 15, k).getBlock() != block) { // Paper - don't need to recheck this - this would only fail due to non main thread writes which are not supported
-                 return null;
-             } else {
-                 TileEntity tileentity;
--- 
-2.21.0
-

Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch

@@ -1,4 +1,4 @@
-From a10cc485d4ce5bb1f614e74963dc97692abca5c8 Mon Sep 17 00:00:00 2001
+From 673d78c402b9a62e34dcd72f6245d681a3f5982d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites

Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch

@@ -1,4 +1,4 @@
-From c371b06835ba7f1737b542fa364b3ec39254289f Mon Sep 17 00:00:00 2001
+From a981972acb8a60a110ebef7a6d3af9da5a0f9921 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner

Spigot-Server-Patches/0321-Add-sun-related-API.patch

@@ -1,4 +1,4 @@
-From c702f3ecb8df067c1bb6dc1e965dcbeb81c6f970 Mon Sep 17 00:00:00 2001
+From d322da3f71ba9a9dc8a6e9f22e55c6c934cf3c21 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API

Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch

@@ -1,4 +1,4 @@
-From cfad07b95d70ee56f185c2563f24b38f1c0b8918 Mon Sep 17 00:00:00 2001
+From cd284840c725df7a8eea02ff8d453c75a7a73459 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config

Spigot-Server-Patches/0323-Here-s-Johnny.patch

@@ -1,4 +1,4 @@
-From 0f3ec7603cd6c59d24a99af91e63846ece172b86 Mon Sep 17 00:00:00 2001
+From 93ddfc43fa2c2ba59434c922b5a2590a8be43d6d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!

Spigot-Server-Patches/0324-Turtle-API.patch

@@ -1,4 +1,4 @@
-From bff3057f1d84be16a1918b764bb88974bb39c217 Mon Sep 17 00:00:00 2001
+From ef41b872c4982e80a19240df91b4ca40084cbd3f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API

Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch

@@ -1,4 +1,4 @@
-From c34bcd8c7a806455fe6d53d9d65b84632a89e9d9 Mon Sep 17 00:00:00 2001
+From 73916b650393d87eefd33f7421b54e6646982228 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance

Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch

@@ -1,4 +1,4 @@
-From 5b343a1fa590b5869013aca47839c69e10490ab2 Mon Sep 17 00:00:00 2001
+From ebe724185c8d350a7951fa62dd0990cc078f3633 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles

Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch

@@ -1,11 +1,11 @@
-From 2b82315c71a9bcb8c7007800a2efa8324085212d Mon Sep 17 00:00:00 2001
+From ce3acb0e1cfe99fbaca4c4a217715097a63004d0 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0f3be967e5..1c1c3a9b58 100644
+index 251166c4fe..bf1a38eb9e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch

@@ -1,4 +1,4 @@
-From 0f101912f19d2a84b07a04113b992fe2f058fafd Mon Sep 17 00:00:00 2001
+From 460ea158187439625e0951326413b2d0da7fad00 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support

Spigot-Server-Patches/0329-Add-more-Witch-API.patch

@@ -1,4 +1,4 @@
-From 2ab7cfc5a693f04477456c63977e582c74724653 Mon Sep 17 00:00:00 2001
+From 5d25654758b4bbd9dc4c7f95b95b57467706fc3e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API

Spigot-Server-Patches/0330-Fix-MC-93764.patch

@@ -1,4 +1,4 @@
-From f45f3b13ae7da7619a327e8b3ccb8ebf9add5feb Mon Sep 17 00:00:00 2001
+From b8da8ba3db1cfbe5c440f12c1617737c865d4c3c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764

Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -1,4 +1,4 @@
-From 99e2e5d7f90954efd632c54d186ae0ab54189f95 Mon Sep 17 00:00:00 2001
+From b4b24e23121b8abb473476ba641da3ffa07b0931 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded

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

@@ -1,4 +1,4 @@
-From fa10811716a328f398076625fff2ac714355db91 Mon Sep 17 00:00:00 2001
+From 9d717c0c68d7bf0f990590915caa787ef2c97286 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn

Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch

@@ -1,4 +1,4 @@
-From 6a1366240d0a49be8672b204580a3d4193a40a13 Mon Sep 17 00:00:00 2001
+From be6c4e46629b49524e0383d07753a5287143826d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs

Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch

@@ -1,4 +1,4 @@
-From 5c1b8e438091417fb534c03794eec54f8c26af7c Mon Sep 17 00:00:00 2001
+From 3352661913ce300d8e92ca22b725abdf99e09b9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed

Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch

@@ -1,4 +1,4 @@
-From d9a13a84b740aab1f61ec78a2c2ae1bc18a670b6 Mon Sep 17 00:00:00 2001
+From bea7762967b9a0ca706ab671928ad78c75a0294a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap

Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch

@@ -1,4 +1,4 @@
-From 22ac6a9266824514c0c7d87f1baf447a49931824 Mon Sep 17 00:00:00 2001
+From 69df5dbd97ea63a84acbff30fa43539b36776692 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block

Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch

@@ -1,4 +1,4 @@
-From 0f036e29388e637dd6f9297c39b79e3e7f617508 Mon Sep 17 00:00:00 2001
+From 409c9eb3f44f34a54c5cd6320293344f33a112bd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3aa62d13a..e160e72cd 100644
+index 2bd1e73702..99306781f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1110,12 +1110,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch

@@ -1,4 +1,4 @@
-From ee0341ae9aeb64368eefaf5090e8097b62df28d5 Mon Sep 17 00:00:00 2001
+From 5654850bc4648a960664978ad828fa45ead8d7eb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support

Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch

@@ -1,4 +1,4 @@
-From b21ba787ad72df2d5a2797af54899858b1f1d2b3 Mon Sep 17 00:00:00 2001
+From 5eecb10090f5f4762301c4115fe3f9fe8fa3cf16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds

Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch

@@ -1,4 +1,4 @@
-From f9882d938dfe10a599af85e4e17bab06157305cd Mon Sep 17 00:00:00 2001
+From ecb0f9a525dcd709af7ffe6dc12b0057f5e98a97 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling

Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From bfbeaf6410c9fb749622b3a8aeca49c6926c2705 Mon Sep 17 00:00:00 2001
+From a09a58f07239dd4589f5439d67339d2fd94f4db5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks

Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From d74e7d03f12f94e8e34a22c6c998581f2571877a Mon Sep 17 00:00:00 2001
+From f15f1eb7a46d5306a08aeeaab913329077e9f421 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm

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

@@ -1,4 +1,4 @@
-From d8846d1d9b36f7499c06538d5ca4d2ea56b1fc21 Mon Sep 17 00:00:00 2001
+From 373ddc724284b8fe67c16fbc02eb1b617eba8120 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation

Spigot-Server-Patches/0344-Book-Size-Limits.patch

@@ -1,4 +1,4 @@
-From 7e0b5cde3d4df722b9ada5763458b8a7d6fb03c3 Mon Sep 17 00:00:00 2001
+From f6ba68dff289d0c882210db346177f7b60fde6ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits

Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch

@@ -1,4 +1,4 @@
-From 6b0f9cbc19378091d7fa2bb49d775035bb858e32 Mon Sep 17 00:00:00 2001
+From 2fb7d628c80d5a2687651ee3ad8333eb8afd3471 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
@@ -29,7 +29,7 @@ index e5e41c6621..8942a06bfe 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 467583f1dc..050bf3eb48 100644
+index c97bf8a05c..88b416f600 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2123,6 +2123,11 @@ public final class CraftServer implements Server {

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

@@ -1,11 +1,11 @@
-From da0e83eea89b72a5a1ef53bdc263e7d9800a1cc4 Mon Sep 17 00:00:00 2001
+From bb8e017aca6dc0f778874c9aff7b34bb7b2c1fac Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 90923c753..5cc08ca7c 100644
+index 90923c7536..5cc08ca7c6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1246,6 +1246,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index 90923c753..5cc08ca7c 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 171c1ae4a..b20fe8e52 100644
+index 171c1ae4ad..b20fe8e521 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 171c1ae4a..b20fe8e52 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020..c4320dbb6 100644
+index 0429cf020e..c4320dbb67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {

Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From f127a303c3ae9dcd3d5bc6e9b9e7ed2ff807de0d Mon Sep 17 00:00:00 2001
+From d6f2a498ef3bc9d5231fa81deb32ddaf11aeb4e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks

Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch

@@ -1,4 +1,4 @@
-From 8e7a7b2614ec2d78ca9e58e2fe997e177484211e Mon Sep 17 00:00:00 2001
+From c191d3ad2b26adff2384d546f04a5fa0df94ae3d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client

Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch

@@ -1,4 +1,4 @@
-From 5ab540d5887122ac61e1034dfd8ce562e9e32218 Mon Sep 17 00:00:00 2001
+From 4455737927d18c12864863aae7b472a529936694 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer

Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch

@@ -1,4 +1,4 @@
-From ba2d6430df5fb8d58e303d546dce4e71798811b1 Mon Sep 17 00:00:00 2001
+From f6d3bade4a828792fa385903471b5f7bd40b65e8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent

Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 7599364b4f73d4e92a7e2b4323c51306a6b8ce48 Mon Sep 17 00:00:00 2001
+From 61e7e1fd21138e68eddd4d37f560713c259de939 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks

Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -1,4 +1,4 @@
-From d2c2dd3a0df3a1d1a5ca748716d162716eb836c9 Mon Sep 17 00:00:00 2001
+From 8de870014ade7786cf691958d00d748f70ee2d8d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0c289f23b0..3c7fa3b349 100644
+index a05b31f73f..79139be389 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch

@@ -1,4 +1,4 @@
-From 236d977d53c277ae3a7a4ac600b2c93e56b6d189 Mon Sep 17 00:00:00 2001
+From c167ffa665c75e09aef00926c808137f14ac0f17 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent

Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch

@@ -1,11 +1,11 @@
-From 709d97714a7449c91512bc641ce6d4653c7ffa0b Mon Sep 17 00:00:00 2001
+From 4d9266472d0a9fc84b622eb5ae7eac04857c0f20 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3c7fa3b349..3ecf18379b 100644
+index 79139be389..c7f22870b6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch

@@ -1,4 +1,4 @@
-From 9438fd1db331f86db760d2f942f659a505b31973 Mon Sep 17 00:00:00 2001
+From e0ce75ac3af28feb8d75d6f798a0bbebf1c5d44c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons

Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch

@@ -1,4 +1,4 @@
-From 1b9103d031521eed6d96097e4ab35ac01333b83c Mon Sep 17 00:00:00 2001
+From 8a8cfa2d3047fa402441f9dd3f622713cd6f19a1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players

Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch

@@ -1,4 +1,4 @@
-From 35fe71a17f9f7b03759a454071bab4271c10218e Mon Sep 17 00:00:00 2001
+From f13ed643df25ab2b58cfaa502ed1fca9d8fce9f8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks

Spigot-Server-Patches/0358-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From b62be4ac2b918c05a97124cdae6401f612efa109 Mon Sep 17 00:00:00 2001
+From f84f42559de248f8f97dda307343e95b4202f136 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent

Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch

@@ -1,4 +1,4 @@
-From 05d405ce34b2fe9a91a6305cd708d9ff0a3c3a9e Mon Sep 17 00:00:00 2001
+From f031ab685f49dc1158381dcb458970337c347477 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes

Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch

@@ -1,4 +1,4 @@
-From d98ebeb1b9251fb9a29a2b688724908225faee4a Mon Sep 17 00:00:00 2001
+From 47e2bc9010beaa48f6499f936412878261da768c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak

Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch

@@ -1,4 +1,4 @@
-From 6cd478dfbae308da5489325346df18951a5d6d31 Mon Sep 17 00:00:00 2001
+From f01f48bbb3786d447d576151c774f91c4499233e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more

Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch

@@ -1,4 +1,4 @@
-From 5ee2afbaf65b8670c794b5306e0f10304743b500 Mon Sep 17 00:00:00 2001
+From c131ebf976c1884fcf24cea8e413853dca989a51 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save

Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch

@@ -1,4 +1,4 @@
-From 7aa4af6a4e6cfee98040ac4af12e1220dddfa134 Mon Sep 17 00:00:00 2001
+From cb25754c6b1cd1ea55947df7962231e573f4813e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of

Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch

@@ -1,4 +1,4 @@
-From 622dfad995b0a662dc75e3859a04add3f2313a93 Mon Sep 17 00:00:00 2001
+From cb5fb077ba3d4403c080d5165ed22b6c61d8cec5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency

Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch

@@ -1,4 +1,4 @@
-From 518ebacc7fb81152b0939838165905f9283a9fae Mon Sep 17 00:00:00 2001
+From 4ed1f174035172513d488e323c518c1a2e595a34 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process

Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch

@@ -1,4 +1,4 @@
-From cbc0d518569f1a16bde39faa584d8d0b4296555e Mon Sep 17 00:00:00 2001
+From a0e2ac24e56ccc005d349e47d69f118805fadd62 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled

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

@@ -1,4 +1,4 @@
-From 447e8e2bd0e9666b3dea66aaba7b00b2c7c48911 Mon Sep 17 00:00:00 2001
+From fb511806774c4635515a6748ccd10e1cec571d94 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity

Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch

@@ -1,4 +1,4 @@
-From d284af28a559df6f8ab0be5674fa0f715ecfa701 Mon Sep 17 00:00:00 2001
+From a39a1f7f5491685a94e71862cd7b13d5107bd01a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text

Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From 6dd34e9f47eef321330d4864c3b00675f215ba02 Mon Sep 17 00:00:00 2001
+From 6e6ee4fad7ff75661e710c36dbacad0bfa44a473 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason

Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch

@@ -1,4 +1,4 @@
-From 05fc2dc2d5f9b5d6924440d433732dcdc4e17793 Mon Sep 17 00:00:00 2001
+From 75adfc0b8852ba9ddb63294e94c07a7746c4765d Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players

Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch

@@ -1,4 +1,4 @@
-From 90d0981dc9a0304ad67936976b2d7c5ea1fe9240 Mon Sep 17 00:00:00 2001
+From 99e60a3248e393efc38dba41811df8e3a6456ffd Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query

Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch

@@ -1,4 +1,4 @@
-From 5057b229edc8e9d414519384ee84b39ba724b9a1 Mon Sep 17 00:00:00 2001
+From fdcd5e2ccf83dd0bf0a1368ac0d5ef27e7ebea5c Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent

Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch

@@ -1,4 +1,4 @@
-From 77eb39ea85dc028b915820c1531380c8593aecb0 Mon Sep 17 00:00:00 2001
+From 4ff0f9e5cdb039f9b78009c6a7fadaf0955d3f8f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items

Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch

@@ -1,4 +1,4 @@
-From 3a4e0fed30ccf8820ec84bb3444ded71f83f394c Mon Sep 17 00:00:00 2001
+From abebe94d9bdaff5c2cefc20fa6084598a2549f01 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and

Spigot-Server-Patches/0375-Server-Tick-Events.patch

@@ -1,4 +1,4 @@
-From c5119783012dfc7197aeab25b2833d7efe9be2d0 Mon Sep 17 00:00:00 2001
+From f7cfb32940e6bb8be5cb2592737ac9096d194878 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e160e72cd..13278cc58 100644
+index 99306781f7..cbb4280631 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1041,6 +1041,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch

@@ -1,4 +1,4 @@
-From 2fa468c9eee8b156f63928940ae0eb765982ff80 Mon Sep 17 00:00:00 2001
+From ee6d727581021ba502e260ef7772b815b2724540 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3ecf18379b..e9f158d8ec 100644
+index c7f22870b6..21ec45e6ff 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch

@@ -1,4 +1,4 @@
-From 605b5f638b3d6eccd0324ddcc92eb75956972222 Mon Sep 17 00:00:00 2001
+From d39b404790e0c44cd8e5e240f83b0f46b099d8f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading

Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch

@@ -1,4 +1,4 @@
-From 0418b980eb03e413cbefe1533d029549047dff03 Mon Sep 17 00:00:00 2001
+From f94dc3af55ef48919f99002a334e18aa5ad2e65e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are
@@ -56,7 +56,7 @@ index 9e4bc24058..028c23dbe6 100644
                              java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress();
                              java.util.UUID uniqueId = i.getId();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6e77fa35b4..70f730996c 100644
+index cbb4280631..ba68d7f833 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -462,6 +462,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch

@@ -1,4 +1,4 @@
-From 363f40d7ee877b98e842212646be030bdd252b33 Mon Sep 17 00:00:00 2001
+From f7ff00e543826ddede7043a2a93f59b389c4e3ef Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to

Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch

@@ -1,4 +1,4 @@
-From 514b1351f36fbbfdd06fb0648db70ebc14168c7c Mon Sep 17 00:00:00 2001
+From 127e9fe0670c0334e6807ea3c207a27e2c1663b5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap

Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch

@@ -1,4 +1,4 @@
-From 2e3ddf2b9f6fc45c46e1a4f4cb4f5eb4cc7f9658 Mon Sep 17 00:00:00 2001
+From dd363bdf7c277f900fb5c05ac99ed1e04b31a734 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup

Spigot-Server-Patches/0382-Add-Heightmap-API.patch

@@ -1,4 +1,4 @@
-From 7c5eec90c34e721e60e2aee5e6c4a763a9fae1f8 Mon Sep 17 00:00:00 2001
+From 4ad300b90a4f9c708ccf1caa43826252d9cede13 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
@@ -20,7 +20,7 @@ index ad58d4fd63..c04d73e738 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 073400f23f..e18ae24bf8 100644
+index 3ebea96931..174d2d4ea0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -317,6 +317,29 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch

@@ -1,4 +1,4 @@
-From 6e248206df5c4aa4a405b1bdb795caa90eee3717 Mon Sep 17 00:00:00 2001
+From 8e2010031aebf8e022a66c2600558212976c47e8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
 will simply defer to whatever that new behavior is.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index b61864641c..d39d49944a 100644
+index 3f7190b6a2..844f491c70 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable {

Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch

@@ -1,4 +1,4 @@
-From eb0d9d309338bc3b69b969a53e39ec7d5840c519 Mon Sep 17 00:00:00 2001
+From 0d1caacd7a1fd4d782c0bef9340cedf81b820ffe Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements

Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch

@@ -1,4 +1,4 @@
-From d507abc75e52b1454cac889610eb6269126db879 Mon Sep 17 00:00:00 2001
+From 7ae8490660016d837931ef812ccedbb7a04b58fa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders

Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch

@@ -1,4 +1,4 @@
-From fb8cb5e9ec8a9a8b230ba0a4eaa0c084bbc96e5a Mon Sep 17 00:00:00 2001
+From 97b715a164d05940fbea66bcf2c578d1c07133eb Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 6 May 2019 12:29:24 -0700
 Subject: [PATCH] Async Chunk placeholder

Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch

@@ -1,4 +1,4 @@
-From 640710079587542caf3a2dd1f8b2403df8b4eac1 Mon Sep 17 00:00:00 2001
+From d3eaa111b7d6dfd67df2c0f8ed30ceb37711f0eb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method

Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch

@@ -1,4 +1,4 @@
-From 24e5017041e53cbd8ba42a721bf7c13ab1abb99c Mon Sep 17 00:00:00 2001
+From 569bbb31c998583effa5b028623671af71e58895 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)

Spigot-Server-Patches/0389-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch

@@ -1,4 +1,4 @@
-From 699c040f962a1d2e090afe8d670b9c73e0a8ab5e Mon Sep 17 00:00:00 2001
+From 4e77b273a6312dfb0f96db8d75f310c0c5e47bb3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 12 May 2019 19:25:53 -0700
 Subject: [PATCH] Fix MC-151674 Close RegionFiles when they get evicted from

Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch

@@ -1,4 +1,4 @@
-From 83cf9f6e211b6801516b40c28e57a7a5f80b9d72 Mon Sep 17 00:00:00 2001
+From 2b5d6bba187e8491490f1428588e846de0038291 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ef850c17e0..934f9f7f07 100644
+index ba68d7f833..f1cd38d421 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1936,7 +1936,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0391-Elide-lock-in-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 16fb499834f4d9e3cc2e8f4460064c0c08632c81 Mon Sep 17 00:00:00 2001
+From 048d145c7ccb0a3f4ab58fa2ebb820cab6587335 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 May 2019 08:19:27 -0700
 Subject: [PATCH] Elide lock in DataWatcher

Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From 932de1a21f0dfbba2e67e8a29f25f1f11f37bf5e Mon Sep 17 00:00:00 2001
+From 9f7d50d96af345270799a30c2a0d941ac3ffd5b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks

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

@@ -1,4 +1,4 @@
-From 8eed40973fd30db2d3026b433bba768bacd18e16 Mon Sep 17 00:00:00 2001
+From c48bcdced365c757fadea5adb6d9cf42bbacf3c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -81,7 +81,7 @@ index ef882b897f..385b3ac0ce 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 12f0fe618d..5340767049 100644
+index 836b012474..c70c84c2a4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -385,6 +385,7 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch

@@ -1,4 +1,4 @@
-From 3c29885d543948746aafb51438538c4b6aae0e77 Mon Sep 17 00:00:00 2001
+From 11c700f7bb5cbf60cfdacc3826a4684c523f030b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded

Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 02e8f627e66a16b1ab66ebf2b9e19ead33cb6fcb Mon Sep 17 00:00:00 2001
+From b87435f92f1bf7621ca2ab3147438a17fc75a9bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world

Spigot-Server-Patches/0396-Fix-some-generation-concurrency-issues.patch

@@ -1,4 +1,4 @@
-From 74fb35c1ea9c0283e1e3bb22b9049d2b4252d315 Mon Sep 17 00:00:00 2001
+From aba3a4f667265a230ca5db9b3b92e07fe48c4325 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues