Revert Don-t-recheck-type-after-setting-a-block.patch

77 files changed, 91 insertions, 124 deletions

diff --git a/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch
deleted file mode 100644
index 14f98e46f2..0000000000
--- a/Spigot-Server-Patches/0365-Don-t-recheck-type-after-setting-a-block.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5c7269fbecfab55d9d9aaae09ccd13df67fad70b Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Fri, 28 Sep 2018 22:27:33 -0400
-Subject: [PATCH] Don't recheck type after setting a block
-
-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 966879a894..0d51c1baeb 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -558,7 +558,7 @@ public class Chunk implements IChunkAccess {
-                 this.world.n(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 {
-                 if (flag1) {
--- 
-2.21.0
-
diff --git a/Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0365-Fix-Sending-Chunks-to-Client.patch
index 014bdbd6b6..bb16f6a58a 100644
--- a/Spigot-Server-Patches/0366-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0365-Fix-Sending-Chunks-to-Client.patch
@@ -1,4 +1,4 @@
-From 07a00d527e871eadaf4a96af5ad367ddcbfa9cc3 Mon Sep 17 00:00:00 2001
+From f3853b510b97905de6c738e186c1cf1df00ddfab Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
@@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates
 the client anytime post processing is triggered with the new chunk data.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0d51c1baeb..46804203fe 100644
+index 966879a894..d1556ec338 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1190,7 +1190,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0366-Configurable-connection-throttle-kick-message.patch
index 183f428daf..8d94c4c41c 100644
--- a/Spigot-Server-Patches/0367-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0366-Configurable-connection-throttle-kick-message.patch
@@ -1,4 +1,4 @@
-From 2b373c407f22a8b2ecfd5fc3a9faa9f94546383c Mon Sep 17 00:00:00 2001
+From b88cd3553c9b79a33a1127c988527111fbe093e5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
diff --git a/Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0367-Fix-FileIOThread-concurrency-issues.patch
index f8d48599a9..28a5753fba 100644
--- a/Spigot-Server-Patches/0368-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0367-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From 4e5812633b869d071215da93dc3cffd797de9951 Mon Sep 17 00:00:00 2001
+From 41c07654d8ff10a9504bbbad54c53ecd21b5cab1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
diff --git a/Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0368-Hook-into-CB-plugin-rewrites.patch
index efeca52c5c..2415178710 100644
--- a/Spigot-Server-Patches/0369-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0368-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 82c714ff2ed5dc92a29901636c8dbf590f4a68ba Mon Sep 17 00:00:00 2001
+From 5467034caa61a9aee8f737fa9d2e146de80f2288 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
diff --git a/Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0369-Allow-setting-the-vex-s-summoner.patch
index 51015c18f8..57172dab3f 100644
--- a/Spigot-Server-Patches/0370-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0369-Allow-setting-the-vex-s-summoner.patch
@@ -1,4 +1,4 @@
-From e709b2648076946859a2a2edd80d180b399fd3d1 Mon Sep 17 00:00:00 2001
+From 0da75093a7ef0c63fcd508341364684f4a84e760 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
diff --git a/Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0370-Add-LivingEntity-getTargetEntity.patch
index b01524e8dc..c6abde9375 100644
--- a/Spigot-Server-Patches/0371-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0370-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From b82067ae505316dca7048faaedeb7f7565406b6e Mon Sep 17 00:00:00 2001
+From cfea22dcd110fdefe8ac62dfdd80ccefaf7eb888 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/Spigot-Server-Patches/0372-Add-sun-related-API.patch b/Spigot-Server-Patches/0371-Add-sun-related-API.patch
index 2c3e89152e..411015c463 100644
--- a/Spigot-Server-Patches/0372-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0371-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From ac264d636345bea08b5ed7a1ff74b972471f6245 Mon Sep 17 00:00:00 2001
+From d9e4914ed2ed8b74735c006f6e4bddd6cc6e8d06 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
@@ -17,7 +17,7 @@ index 856ddf2a74..d1ec201d8a 100644
          if (this.world.L() && !this.world.isClientSide) {
              float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 728319968b..027bb64acc 100644
+index 8d20f6d05d..94e189a550 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0372-Check-Drowned-for-Villager-Aggression-Config.patch
index 59aeaa251d..0817976b40 100644
--- a/Spigot-Server-Patches/0373-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0372-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,4 +1,4 @@
-From 27b640541e74e7f1607ad073af6f4b03645d5151 Mon Sep 17 00:00:00 2001
+From d681230da7bca663dcff13d928909756114ad330 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
diff --git a/Spigot-Server-Patches/0374-Here-s-Johnny.patch b/Spigot-Server-Patches/0373-Here-s-Johnny.patch
index 00a75b96b2..5b15251157 100644
--- a/Spigot-Server-Patches/0374-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0373-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From a5499b66282e7f75a127044fd454a2927ff7e4f3 Mon Sep 17 00:00:00 2001
+From e0c3da62c384cc43e3eaccbb71e5f10f808a9a37 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
diff --git a/Spigot-Server-Patches/0375-Turtle-API.patch b/Spigot-Server-Patches/0374-Turtle-API.patch
index bb038523c6..31cd7346e3 100644
--- a/Spigot-Server-Patches/0375-Turtle-API.patch
+++ b/Spigot-Server-Patches/0374-Turtle-API.patch
@@ -1,4 +1,4 @@
-From 0145dcdb179116632a79d6734a4829db2ee0c740 Mon Sep 17 00:00:00 2001
+From 2feb48b06690a9ad912b07fb4b0c73f8604e51ac Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
diff --git a/Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0375-Limit-lightning-strike-effect-distance.patch
index 6e9d3b7540..d0cb276096 100644
--- a/Spigot-Server-Patches/0376-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0375-Limit-lightning-strike-effect-distance.patch
@@ -1,4 +1,4 @@
-From baf45e6afa85406637c126b82ac06e48a949e18f Mon Sep 17 00:00:00 2001
+From 5b3ada39b30fd9c4ff2a65c97f96f1cc7eed53f1 Mon Sep 17 00:00:00 2001
 From: Trigary <[email protected]>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
diff --git a/Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 447ddd8c6b..0118a9c61e 100644
--- a/Spigot-Server-Patches/0377-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 537a387c3e1511657b618532f2866fbc92e1dd8b Mon Sep 17 00:00:00 2001
+From 16d69bbdf837e4ed64d081f938bb1b5031cba0d4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
diff --git a/Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0377-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index eb027d1320..800b1f00a6 100644
--- a/Spigot-Server-Patches/0378-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0377-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From a8c45fca2ef99f438a12b9ca59f9ca0ab03e86d0 Mon Sep 17 00:00:00 2001
+From 899af4c729c7d365a228b5d343040d55c10b4dde Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
diff --git a/Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0378-Call-player-spectator-target-events.patch
index 1016ce0a03..0049221d30 100644
--- a/Spigot-Server-Patches/0379-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0378-Call-player-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From d1b3dc4217aa68d0c522bb1f600ddebb54a191af Mon Sep 17 00:00:00 2001
+From 333447a35bf2b819c847e21518431d7aa69b3157 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <[email protected]>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
diff --git a/Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0379-Add-Velocity-IP-Forwarding-Support.patch
index f3b4b349d8..aee75b6bcb 100644
--- a/Spigot-Server-Patches/0380-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0379-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 5d4e0ebff8236bcee63ca414af432baff1681c40 Mon Sep 17 00:00:00 2001
+From 7391eed7fedeca7fd017eb73112b6c04c6cdf240 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <[email protected]>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
diff --git a/Spigot-Server-Patches/0381-Add-more-Witch-API.patch b/Spigot-Server-Patches/0380-Add-more-Witch-API.patch
index e05cb067a1..ce28b67445 100644
--- a/Spigot-Server-Patches/0381-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0380-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 3bbdc053fd65bd8f74f4886348e1833250a3a22b Mon Sep 17 00:00:00 2001
+From 088816d1d3369362e024ac4adb488002dd46f696 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
diff --git a/Spigot-Server-Patches/0382-Fix-MC-93764.patch b/Spigot-Server-Patches/0381-Fix-MC-93764.patch
index cb31e84ca6..24197aa01c 100644
--- a/Spigot-Server-Patches/0382-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0381-Fix-MC-93764.patch
@@ -1,4 +1,4 @@
-From a61ea1bde3ba2fca97d74e75926539f83e504f1a Mon Sep 17 00:00:00 2001
+From 0ff380f9c035db980e14cf94c581171f789540ed Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
diff --git a/Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0382-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 9ac4c1b740..bf92a387de 100644
--- a/Spigot-Server-Patches/0383-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0382-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From 92cb3409be8524f1e5684352cd18fc5737491707 Mon Sep 17 00:00:00 2001
+From c14c36d154b0a213a409f6d00d893980e960af6e Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
diff --git a/Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0383-Reset-players-airTicks-on-respawn.patch
index b513b7c2de..92b07a657f 100644
--- a/Spigot-Server-Patches/0384-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0383-Reset-players-airTicks-on-respawn.patch
@@ -1,4 +1,4 @@
-From 80169c2065257040205b6544a51cdb3975c14bdb Mon Sep 17 00:00:00 2001
+From f9425f4c200d0cbdfa3692e645a9c638d8b57819 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <[email protected]>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
diff --git a/Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0384-Strip-private-area-unicode-characters-from-signs.patch
index 7e694e4f58..73b4fd7908 100644
--- a/Spigot-Server-Patches/0385-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0384-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 9cf28103bd677d93deb8ea8a0adf3c095a6e3b73 Mon Sep 17 00:00:00 2001
+From 6281116cdaa5216c32b521eb2e13a0014a512ef8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
diff --git a/Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0385-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 1de9cc7818..61a176296e 100644
--- a/Spigot-Server-Patches/0386-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0385-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 36a9e372200a64be4ebbc59acf474aa3e4ac0eff Mon Sep 17 00:00:00 2001
+From 9f538dcbfc2710074a6209e84491f4cd6b47644d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
diff --git a/Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0386-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 50b4d30c5f..3528ccbf8b 100644
--- a/Spigot-Server-Patches/0387-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0386-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,4 +1,4 @@
-From 1a60b5dbb30c2608e2af7833c00aa29dbb141e20 Mon Sep 17 00:00:00 2001
+From 995883971569c4d95bb6985dbb357ed3ff5bd7b3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
diff --git a/Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0387-Use-EntityTypes-for-living-entities.patch
index 1d43a1d96d..8e097694aa 100644
--- a/Spigot-Server-Patches/0388-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0387-Use-EntityTypes-for-living-entities.patch
@@ -1,4 +1,4 @@
-From a7f8efc50ad709eeb7991d8a460ed6075115175d Mon Sep 17 00:00:00 2001
+From ff6351637d37d25c5b87dc36f5241e8d2f0304f4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities
diff --git a/Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0388-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index 5bf4fbb30c..2ad0b9b833 100644
--- a/Spigot-Server-Patches/0389-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0388-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From 20db885a920ddae1dc283c0c906b2b226739ae89 Mon Sep 17 00:00:00 2001
+From 72b8d6b567dac8a398b608e0fee3ba0b569b1de2 Mon Sep 17 00:00:00 2001
 From: MisterVector <[email protected]>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
diff --git a/Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0389-Optimize-World-Time-Updates.patch
index c606533e44..b48fc7b1d7 100644
--- a/Spigot-Server-Patches/0390-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0389-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 42871ad2d0b7b9bd4d5ecfafc8b03e532384ff11 Mon Sep 17 00:00:00 2001
+From 3de4a29697e5cf3c664a5d345d93992ac54c7887 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
diff --git a/Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0390-Restore-custom-InventoryHolder-support.patch
index 6b8c552f85..9b432d810f 100644
--- a/Spigot-Server-Patches/0391-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0390-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 54bbc25ce96d023b76be2fa5c280bf2d6d8015f3 Mon Sep 17 00:00:00 2001
+From d189afa3b58a384d3e13912a8b601c6b01a04573 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
diff --git a/Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0391-Use-Vanilla-Minecart-Speeds.patch
index 1454758673..98f1f1429a 100644
--- a/Spigot-Server-Patches/0392-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0391-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From f84c15041538210bd0cde5c8296beb9d207518ce Mon Sep 17 00:00:00 2001
+From 4117def33cefa1ab5d4692c6f0f304b8459d6ae7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
diff --git a/Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0392-Fix-SpongeAbsortEvent-handling.patch
index 6fd3c58fbf..6630beea38 100644
--- a/Spigot-Server-Patches/0393-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0392-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From ce9234ee5d3532f7e454a0033d4420c8cdbd6f6c Mon Sep 17 00:00:00 2001
+From fedcb31ed5771fc6eb082a7f449b4930ab0de492 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
diff --git a/Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0393-Don-t-allow-digging-into-unloaded-chunks.patch
index 34d64b3a6a..ccd3ffc383 100644
--- a/Spigot-Server-Patches/0394-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0393-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From c9b3d48edee5c67f2d1af7bd247e6ec5b634446f Mon Sep 17 00:00:00 2001
+From 73602cd9a5eec66c5532c852088212ea84583e12 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
diff --git a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0394-Optimize-redstone-algorithm.patch
index 93e6da3db7..e9ddd44e51 100644
--- a/Spigot-Server-Patches/0395-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0394-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 1a5d05cb2c1a7eda1f6eec4a99175f40f1fbc001 Mon Sep 17 00:00:00 2001
+From 38967270f42cbfe7456f9f4a901b2a8dbf8fc057 Mon Sep 17 00:00:00 2001
 From: theosib <[email protected]>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61ad2cef7..a70a64070 100644
+index 61ad2cef7b..a70a64070e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -588,4 +588,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index 61ad2cef7..a70a64070 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 000000000..21d9d6d7e
+index 0000000000..21d9d6d7ed
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,910 @@
@@ -954,7 +954,7 @@ index 000000000..21d9d6d7e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 2e30270bb..72d261707 100644
+index 2e30270bb7..72d2617071 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1122,7 +1122,7 @@ index 2e30270bb..72d261707 100644
                  iblockdata.a(world, blockposition, 0);
                  world.setAir(blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 94e189a55..d790fd89f 100644
+index 94e189a550..d790fd89f7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0395-force-entity-dismount-during-teleportation.patch
index 1f4c47f467..1f393d8f97 100644
--- a/Spigot-Server-Patches/0396-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0395-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From e5b4fd7a68006fa22e4d6efea4893026f03e284e Mon Sep 17 00:00:00 2001
+From ef16ed942991bf50d75d77c6889dd62629314e45 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
diff --git a/Spigot-Server-Patches/0397-Book-Size-Limits.patch b/Spigot-Server-Patches/0396-Book-Size-Limits.patch
index 58ff880c4a..2504273e51 100644
--- a/Spigot-Server-Patches/0397-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0396-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From e2d85e74d938a2486d48169b69af45ffb70eb811 Mon Sep 17 00:00:00 2001
+From 2370d39567607fd82fe045f6290baf063e90fef8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
diff --git a/Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0397-Make-the-default-permission-message-configurable.patch
index a773d1b250..a488787f38 100644
--- a/Spigot-Server-Patches/0398-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0397-Make-the-default-permission-message-configurable.patch
@@ -1,4 +1,4 @@
-From b9b889e4ac8118cc7aaeba6c4dd296f767002436 Mon Sep 17 00:00:00 2001
+From 166fdc798d2c233284a2614f979b33b3870ccbab Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
diff --git a/Spigot-Server-Patches/0399-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0398-Add-more-Zombie-API.patch
index 66eae07361..c20f351668 100644
--- a/Spigot-Server-Patches/0399-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0398-Add-more-Zombie-API.patch
@@ -1,4 +1,4 @@
-From 71f4a80d0a3fa035ed1bee5c0539f65f0a4b9639 Mon Sep 17 00:00:00 2001
+From 296a608e9d11e22b986858a98ea69fa2456b92a6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
diff --git a/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0399-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
index 08cb37a60d..ecaf762ae3 100644
--- a/Spigot-Server-Patches/0400-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0399-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@@ -1,4 +1,4 @@
-From b8d0b1dc65c1afec931ebcbe8f196c7ecc92fefe Mon Sep 17 00:00:00 2001
+From 10f0e5e9acaf3a64baf52483ef99d2d6b1f86cfc Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
@@ -12,7 +12,7 @@ decrease when set, allowing us to skip further checks earlier on
 when looking for an attackable entity
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d790fd89f..c9a65f7a6 100644
+index d790fd89f7..c9a65f7a60 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2720,8 +2720,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch
index 80644b4b1a..beec156856 100644
--- a/Spigot-Server-Patches/0401-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0400-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From b5b512f38eb6de0b6887ea7b61cc07acb4043188 Mon Sep 17 00:00:00 2001
+From 11841ac355d403ada181a7bb338119c8df19c2ed Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7721dfee65..1454af710e 100644
+index c9a65f7a60..789f9b63c1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0401-Handle-Large-Packets-disconnecting-client.patch
index 11f1ace845..5aa43855ca 100644
--- a/Spigot-Server-Patches/0402-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0401-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From b07b820037f167f150b3af33ed2fff7e9cd88ea6 Mon Sep 17 00:00:00 2001
+From 2ce7c332bf662e3ddf29fda6608c045e4bc0fcaa Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
diff --git a/Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0402-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 92eadc8e93..c10121202a 100644
--- a/Spigot-Server-Patches/0403-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0402-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 240f4d59799fbc801df981f49420cf9b5a9b563f Mon Sep 17 00:00:00 2001
+From 6a7778f0999c4c4205e7bc4839c54080319ec963 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
diff --git a/Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0403-Add-PlayerConnectionCloseEvent.patch
index 8327d25067..c201910790 100644
--- a/Spigot-Server-Patches/0404-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0403-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 162fee0c9a057136c8fc744b62f1c0926a1e6220 Mon Sep 17 00:00:00 2001
+From e9dbaf795fa031bb5b79bc5ba49b37dda17d43d9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
diff --git a/Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0404-Prevent-Enderman-from-loading-chunks.patch
index 870a384ec9..326a31378d 100644
--- a/Spigot-Server-Patches/0405-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0404-Prevent-Enderman-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 747ca560c9bc065b36c1649811507dc0d1a6e456 Mon Sep 17 00:00:00 2001
+From ddb7e1081efbe525d9d2daf3cfc5f6a97fc8f65c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
diff --git a/Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0405-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index e587636248..0a15d17ad6 100644
--- a/Spigot-Server-Patches/0406-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0405-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From de09720b1332eaf211d79f51318a4c3c1a12eb2e Mon Sep 17 00:00:00 2001
+From 15c47ec9ce65bdbcbeb5cd913f9b2113ba27f091 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
diff --git a/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0406-Fix-PlayerEditBookEvent.patch
index 0d88970c0f..9a715db9e3 100644
--- a/Spigot-Server-Patches/0407-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0406-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From a5eec7e0b987b7adeeb8a9ec29aaa09b003b8860 Mon Sep 17 00:00:00 2001
+From 50c1bf042b2a039dcc0477b77164025fd11c01fb Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
diff --git a/Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0407-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index fd3b6aa990..021de54f0a 100644
--- a/Spigot-Server-Patches/0408-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0407-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,4 +1,4 @@
-From c693e26da2f98ce91cb05d220f05c5faf5a253c3 Mon Sep 17 00:00:00 2001
+From d733b73d25bc2c62785c907942d5ec74426995a8 Mon Sep 17 00:00:00 2001
 From: connorhartley <[email protected]>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
diff --git a/Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0408-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index a6d13d2990..cbada34d74 100644
--- a/Spigot-Server-Patches/0409-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0408-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From c9cd937ba5a7735bb88c1be1b478d0adcc871a9a Mon Sep 17 00:00:00 2001
+From 3c9659cd27cef3f0b62da872ed3562e09ffa373c Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
diff --git a/Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0409-Block-Entity-remove-from-being-called-on-Players.patch
index 681f6c4b2e..d74938e022 100644
--- a/Spigot-Server-Patches/0410-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0409-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 355b9a0bb1d1af72cb61b3f8850c5b387dcf7b89 Mon Sep 17 00:00:00 2001
+From 9c747b07188a41935255652d35f3fafce5c98efc Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
diff --git a/Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0410-Allow-Saving-of-Oversized-Chunks.patch
index 99f072cb83..ee0b457810 100644
--- a/Spigot-Server-Patches/0411-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0410-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 828d56a3dccc292ea38fa319aaec5477291e3e8c Mon Sep 17 00:00:00 2001
+From 7fc69ad6ff0add30867c2bdfbdf15f79ee3c2ca2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
diff --git a/Spigot-Server-Patches/0412-BlockDestroyEvent.patch b/Spigot-Server-Patches/0411-BlockDestroyEvent.patch
index d03864e226..1ffcf3e3d2 100644
--- a/Spigot-Server-Patches/0412-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0411-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 340d46ba0e1d0bac0baffe2a0bcfa0d87fcff70e Mon Sep 17 00:00:00 2001
+From 383f8b2e99f1162e4b10e225af33961c6e63b705 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1454af710e..e280b58531 100644
+index 789f9b63c1..a7a7250324 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0412-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 795914e5e8..686508de59 100644
--- a/Spigot-Server-Patches/0413-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0412-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 9ba6775e3eddfd4b8af01471ce6cf7b3a658291a Mon Sep 17 00:00:00 2001
+From b542649faa7b173cbe7bbc107f619b446c7f2913 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
diff --git a/Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0413-Fix-sign-edit-memory-leak.patch
index d2f316477c..b3c409937a 100644
--- a/Spigot-Server-Patches/0414-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0413-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From c1585662600e8e6bfee07aa5a791f388de85717a Mon Sep 17 00:00:00 2001
+From cb7ef6626d134b3d6dd1325d3b815ef49f4dca81 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
diff --git a/Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0414-Limit-Client-Sign-length-more.patch
index 5ff9668fb1..ea9ca2a94c 100644
--- a/Spigot-Server-Patches/0415-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0414-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 9278475d36f65e5b95b44b28ff15b9524015973e Mon Sep 17 00:00:00 2001
+From 976a44a52647981508f406d3010048d27dd79a40 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
diff --git a/Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0415-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index f20ecbfc99..59e3b456a8 100644
--- a/Spigot-Server-Patches/0416-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0415-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From f0aeb314f4816c28b5007dbfbdb005d10143d724 Mon Sep 17 00:00:00 2001
+From 2fa084ec05ab595bf3b7db61332c33374223f447 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
diff --git a/Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0416-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index f6473b2618..df93bbe0b8 100644
--- a/Spigot-Server-Patches/0417-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0416-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From d2464a0cfa4f2c0bb30336e4e6d7d757649c7a21 Mon Sep 17 00:00:00 2001
+From 3109c1c0a557665c04ccfa78067d93a04d085ff3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
diff --git a/Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0417-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index ef291025d5..f531d78000 100644
--- a/Spigot-Server-Patches/0418-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0417-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From 4ff4f66ea29bd8405f2e5182c9746214f12b53a3 Mon Sep 17 00:00:00 2001
+From 4402cefabfdb626f0ccca5d655e2328b84bcb229 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
diff --git a/Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0418-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 7e9f056a76..57549592c1 100644
--- a/Spigot-Server-Patches/0419-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0418-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From ff4860cb5f82d587c904247af5dafe3e4f2916a9 Mon Sep 17 00:00:00 2001
+From f01aab41710008303b13222f0ff7a47c71be5583 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
diff --git a/Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0419-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 1405803fdc..ef8fc0caa8 100644
--- a/Spigot-Server-Patches/0420-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0419-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,4 +1,4 @@
-From 6bf7f6d474e8bb96afb2cbdd3c273f9a25c269da Mon Sep 17 00:00:00 2001
+From eb0e934626eb08d7dd6c3fad4aca46e1664981b9 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
diff --git a/Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0420-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index 3862458b05..920e3efad7 100644
--- a/Spigot-Server-Patches/0421-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0420-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From f914570652750a8a7d94fe7ccb6b8a860f3c5d25 Mon Sep 17 00:00:00 2001
+From d661f8fa1f8e0207b7149db0bf5633331e3845a7 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
diff --git a/Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0421-Entity-getEntitySpawnReason.patch
index 5d114156b9..b7aaf03b17 100644
--- a/Spigot-Server-Patches/0422-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0421-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 6878901664ce139320799123c21205c632518b94 Mon Sep 17 00:00:00 2001
+From d59eed96854235065933cc8118246b82646c3220 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -98,7 +98,7 @@ index b1630137ec..df416e3b59 100644
              if (entity != null) {
                  UUID uuid = nbttagcompound1.a("Attach");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e280b58531..0e8025d311 100644
+index a7a7250324..aa04b95646 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1084,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0422-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index c96473b008..9f72dd00f1 100644
--- a/Spigot-Server-Patches/0423-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0422-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 07bc019d7485fc75328f148ca9498a5216a3f657 Mon Sep 17 00:00:00 2001
+From 35385d028f1e70e228f22f78184e55ac6301975d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
diff --git a/Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0423-Update-entity-Metadata-for-all-tracked-players.patch
index c524fdbbe1..f1b1126a46 100644
--- a/Spigot-Server-Patches/0424-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0423-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,4 +1,4 @@
-From a10f5f8613944c8b57e54babc61a3f93fc878433 Mon Sep 17 00:00:00 2001
+From 260c5b7ab0070e16df492fedb42989b6b665b9c5 Mon Sep 17 00:00:00 2001
 From: AgentTroll <[email protected]>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
diff --git a/Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0424-Fire-event-on-GS4-query.patch
index 330293f1b8..12f798f3ab 100644
--- a/Spigot-Server-Patches/0425-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0424-Fire-event-on-GS4-query.patch
@@ -1,4 +1,4 @@
-From d93407a6a86afa6ade028a6285c54b2b5374dd9f Mon Sep 17 00:00:00 2001
+From e557c04d525ee315b19f0e375ae8f8304e6e5132 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <[email protected]>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
diff --git a/Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0425-Implement-PlayerPostRespawnEvent.patch
index a66cd22a10..e08e210707 100644
--- a/Spigot-Server-Patches/0426-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0425-Implement-PlayerPostRespawnEvent.patch
@@ -1,4 +1,4 @@
-From 86fdb38b7adbe22c2122182b9aaa623e0cc59b52 Mon Sep 17 00:00:00 2001
+From 93375b92cec01b6df35127f72fdc7131dd7606a1 Mon Sep 17 00:00:00 2001
 From: MisterVector <[email protected]>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
diff --git a/Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0426-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 44f01f4a06..cc9b1e147d 100644
--- a/Spigot-Server-Patches/0427-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0426-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 8e7a5ca3bc46e18ff3d7bde7ca3cbe7b713623a8 Mon Sep 17 00:00:00 2001
+From 3e0f2cba85cf3973263dc0e979f575d13871fc3b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
diff --git a/Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch b/Spigot-Server-Patches/0427-Don-t-update-entity-trackers-for-worlds-without-play.patch
index e3348db920..d29f3b9ad0 100644
--- a/Spigot-Server-Patches/0428-Don-t-update-entity-trackers-for-worlds-without-play.patch
+++ b/Spigot-Server-Patches/0427-Don-t-update-entity-trackers-for-worlds-without-play.patch
@@ -1,4 +1,4 @@
-From efd33c3794e72cc40a77a3e58ecf90aec6efd6c2 Mon Sep 17 00:00:00 2001
+From 8c2ebd93987cb69b1d026be706cde64064199c8c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Sun, 24 Mar 2019 18:52:31 +0000
 Subject: [PATCH] Don't update entity trackers for worlds without players
diff --git a/Spigot-Server-Patches/0429-Server-Tick-Events.patch b/Spigot-Server-Patches/0428-Server-Tick-Events.patch
index afc6fba092..51549e95da 100644
--- a/Spigot-Server-Patches/0429-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0428-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 0051bbc2ee1699aed51c6ca5dddb1a3f033aa444 Mon Sep 17 00:00:00 2001
+From c4bf9f6376eaced57b5b23e4426002e1c78c8782 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
diff --git a/Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0429-PlayerDeathEvent-getItemsToKeep.patch
index 7f1815dcfa..6fda60f020 100644
--- a/Spigot-Server-Patches/0430-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0429-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 4feb8f9b2bffe706d9eade116d6bf311dc77c451 Mon Sep 17 00:00:00 2001
+From 65ec7e6f63ce18e7104c5647956ead8a476ed70a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
diff --git a/Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0430-Optimize-Persistent-Data-Loading.patch
index 33633082d6..05a81edecf 100644
--- a/Spigot-Server-Patches/0431-Optimize-Persistent-Data-Loading.patch
+++ b/Spigot-Server-Patches/0430-Optimize-Persistent-Data-Loading.patch
@@ -1,4 +1,4 @@
-From f640bef2e74224aa9ef01b0351f951e9e5b517d7 Mon Sep 17 00:00:00 2001
+From 647ca67e93ab289f8ccc920b602fa59b00f949a2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading
diff --git a/Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0431-Allow-login-events-to-fire-only-after-the-server-plu.patch
index da68f4a055..8f9767a011 100644
--- a/Spigot-Server-Patches/0432-Allow-login-events-to-fire-only-after-the-server-plu.patch
+++ b/Spigot-Server-Patches/0431-Allow-login-events-to-fire-only-after-the-server-plu.patch
@@ -1,4 +1,4 @@
-From 75a702d4b18f81dd7b3a17296e9ddef09f7b67d1 Mon Sep 17 00:00:00 2001
+From 6cfcbcfd0c0252c945e9058598d2e793ee7f2bbc Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are
diff --git a/Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0432-Make-region-files-more-reliable-to-write-to.patch
index f7cbe7384b..c3a341706f 100644
--- a/Spigot-Server-Patches/0433-Make-region-files-more-reliable-to-write-to.patch
+++ b/Spigot-Server-Patches/0432-Make-region-files-more-reliable-to-write-to.patch
@@ -1,4 +1,4 @@
-From ed7d354ccaa9465fd12030d6a0621780ecbe14fc Mon Sep 17 00:00:00 2001
+From a1302f191f49bae1d19fa8cf1104b81acb83472b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to
diff --git a/Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0433-Optimize-GameRules-to-use-LinkedHashMap.patch
index 3068614997..910b736bea 100644
--- a/Spigot-Server-Patches/0434-Optimize-GameRules-to-use-LinkedHashMap.patch
+++ b/Spigot-Server-Patches/0433-Optimize-GameRules-to-use-LinkedHashMap.patch
@@ -1,4 +1,4 @@
-From dac566303446ee307bd3875361c7bf94a192e45b Mon Sep 17 00:00:00 2001
+From d0a0981ed4bc59fee1f9871d45f0c8b4d0ac2620 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap
diff --git a/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0434-Optimize-Captured-TileEntity-Lookup.patch
index 7775be729e..30886d73f2 100644
--- a/Spigot-Server-Patches/0435-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0434-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From bbf5a5ff04d56b217118ab54e6c2d91bb16ce7bb Mon Sep 17 00:00:00 2001
+From 1c0b15ed0ccee3e34f15554e58e264de191977f1 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index aa04b9564..f5156a89a 100644
+index aa04b95646..f5156a89a5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1934,12 +1934,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0436-Add-Heightmap-API.patch b/Spigot-Server-Patches/0435-Add-Heightmap-API.patch
index a051e25809..f258536d33 100644
--- a/Spigot-Server-Patches/0436-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0435-Add-Heightmap-API.patch
@@ -1,11 +1,11 @@
-From 899b3fb3c22a1f365bfef5318b90b99b632c0a49 Mon Sep 17 00:00:00 2001
+From fe680851757a281419cb6ce4de40016d32727b3e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <[email protected]>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b940f95bdb..d20f6ac7e4 100644
+index f5156a89a5..57b0f1a38e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -720,6 +720,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0436-Handle-bad-chunks-more-gracefully.patch
index 5f044d3c10..0aa83b1344 100644
--- a/Spigot-Server-Patches/0437-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0436-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From d0f37a6611ca8b011d391ced8e259e23b78aaee9 Mon Sep 17 00:00:00 2001
+From c783a97918fbfc9ec2da1f1cca9475bfcd4f7844 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
diff --git a/Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch b/Spigot-Server-Patches/0437-Fix-NPE-from-sign-placement.patch
index 11bb5611be..59e0f8b163 100644
--- a/Spigot-Server-Patches/0438-Fix-NPE-from-sign-placement.patch
+++ b/Spigot-Server-Patches/0437-Fix-NPE-from-sign-placement.patch
@@ -1,4 +1,4 @@
-From d5c2e00a30aa96c665393676e4dc49aa0a2feed2 Mon Sep 17 00:00:00 2001
+From 5101cc45bfa0c0bfe7b10ec48a179486dda609b0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Wed, 17 Apr 2019 00:48:59 +0100
 Subject: [PATCH] Fix NPE from sign placement
diff --git a/Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0438-Mob-Spawner-API-Enhancements.patch
index d3596719d4..92295e3c76 100644
--- a/Spigot-Server-Patches/0439-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0438-Mob-Spawner-API-Enhancements.patch
@@ -1,4 +1,4 @@
-From 965a2dc88afd9fb86088110cf7104e3aae020428 Mon Sep 17 00:00:00 2001
+From a22319f1c97b10ac0fc4e94467a2502c10e1c859 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <[email protected]>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
diff --git a/Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch b/Spigot-Server-Patches/0439-don-t-NPE-on-dimensionmanager-toString.patch
index 4593ed7d1f..cc441b634c 100644
--- a/Spigot-Server-Patches/0440-don-t-NPE-on-dimensionmanager-toString.patch
+++ b/Spigot-Server-Patches/0439-don-t-NPE-on-dimensionmanager-toString.patch
@@ -1,4 +1,4 @@
-From 77a1e11685c6e91533e16f35ae3f0fe4fefbffc1 Mon Sep 17 00:00:00 2001
+From 701880fb5c0094c2569b8c7340cf0fa4277433ac Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Mon, 22 Apr 2019 19:51:14 +0100
 Subject: [PATCH] don't NPE on dimensionmanager toString
diff --git a/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0440-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index c35e847aef..4b97beb4c0 100644
--- a/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0440-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From f175505ce0a62b77390a9d7c83dfa52c309287a3 Mon Sep 17 00:00:00 2001
+From 273c93317bcf0f5acd823b31eae7e1f2da65a0d8 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <[email protected]>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 964509a3..1b1e0838 100644
+index 964509a337..1b1e083896 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -186,7 +186,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 964509a3..1b1e0838 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 227a9ffa..d6328d2f 100644
+index 227a9ffa03..d6328d2fd2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -51,7 +51,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@@ -32,5 +32,5 @@ index 227a9ffa..d6328d2f 100644
          this.entity = frame;
      }
 -- 
-2.18.0.windows.1
+2.21.0