diff --git a/Spigot-API-Patches/API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
index 634f5b3c51..5a628e5985 100644
--- a/Spigot-API-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 7664728a0..064acf321 100644
+index 7664728a..064acf32 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -0,0 +0,0 @@ public interface Block extends Metadatable {
diff --git a/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
index d2b9f71509..4dec48c4ff 100644
--- a/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 79c0e598a..5f3e085e3 100644
+index 5e65657a..c273b9dc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
index 6812331fe5..eeee115329 100644
--- a/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index d82790717..658eac264 100644
+index d8279071..658eac26 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -0,0 +0,0 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -69,7 +69,7 @@ index d82790717..658eac264 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1e349066d..c9f027f99 100644
+index 5dc04f47..ddf226a4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 8287e23f52..ee21c7b452 100644
--- a/Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
 
 
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index abf68a2c7..fcb03b830 100644
+index abf68a2c..fcb03b83 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
 @@ -0,0 +0,0 @@ public interface CommandSender extends Permissible {
@@ -40,7 +40,7 @@ index abf68a2c7..fcb03b830 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b57b6981d..2096656ee 100644
+index 959add05..5109a0c3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/Spigot-API-Patches/Add-BeaconEffectEvent.patch b/Spigot-API-Patches/Add-BeaconEffectEvent.patch
index a0c68bceeb..e82f5fe3bf 100644
--- a/Spigot-API-Patches/Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/Add-BeaconEffectEvent.patch
@@ -91,6 +91,4 @@ index 00000000..6579ae99
 +        return handlers;
 +    }
 +}
--- 
-2.17.0 (Apple Git-106)
-
+--
\ No newline at end of file
diff --git a/Spigot-API-Patches/Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/Add-EntityKnockbackByEntityEvent.patch
index 31860f4d2c..6cc16824c8 100644
--- a/Spigot-API-Patches/Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/Add-EntityKnockbackByEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
 new file mode 100644
-index 000000000..f6ef11624
+index 00000000..f6ef1162
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
index e9f5511035..ba2ce00c92 100644
--- a/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 3012aec22..63dd1b32d 100644
+index 3012aec2..63dd1b32 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -0,0 +0,0 @@ public interface ItemFactory {
@@ -28,7 +28,7 @@ index 3012aec22..63dd1b32d 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 5e8de1152..c3cb1247f 100644
+index 5e8de115..c3cb1247 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
diff --git a/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
index 940b4abc4b..84ab412c7a 100644
--- a/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add "getNearbyXXX" methods to Location
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 916238c4d..162a76e8b 100644
+index 916238c4..162a76e8 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -0,0 +0,0 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable;
diff --git a/Spigot-API-Patches/Add-getTPS-method.patch b/Spigot-API-Patches/Add-getTPS-method.patch
index 3ee796ab48..c589db7602 100644
--- a/Spigot-API-Patches/Add-getTPS-method.patch
+++ b/Spigot-API-Patches/Add-getTPS-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 52ce3cd4..8a6529f3 100644
+index 14e425d1..6055c801 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 52ce3cd4..8a6529f3 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6572f3ac..9651a45c 100644
+index 9d2326ca..1632af18 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 83598b8247..802d463f59 100644
--- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 8cf98673d..f67711fd7 100644
+index 8cf98673..f67711fd 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/Spigot-API-Patches/Add-version-history-to-version-command.patch b/Spigot-API-Patches/Add-version-history-to-version-command.patch
index 840cf8d5aa..ef42428007 100644
--- a/Spigot-API-Patches/Add-version-history-to-version-command.patch
+++ b/Spigot-API-Patches/Add-version-history-to-version-command.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add version history to version command
 
 diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 new file mode 100644
-index 000000000..1daaca2fd
+index 00000000..1daaca2f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 @@ -0,0 +0,0 @@
@@ -154,7 +154,7 @@ index 000000000..1daaca2fd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index f38f68640..5cebb2454 100644
+index f38f6864..5cebb245 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -0,0 +0,0 @@ import org.json.simple.parser.ParseException;
diff --git a/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 6393c3ef25..42bb81e660 100644
--- a/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -18,7 +18,7 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 8dcb15fb8..7e1ee875e 100644
+index 8dcb15fb..7e1ee875 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -0,0 +0,0 @@ import org.bukkit.util.Vector;
@@ -49,7 +49,7 @@ index 8dcb15fb8..7e1ee875e 100644
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 61f2cd9a7..30204b987 100644
+index 61f2cd9a..30204b98 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -91,7 +91,7 @@ index 61f2cd9a7..30204b987 100644
       * Gets the y coordinate of the lowest block at this position such that the
       * block and all blocks above it are transparent for lighting purposes.
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 064acf321..d1a9512aa 100644
+index 064acf32..d1a9512a 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -0,0 +0,0 @@ public interface Block extends Metadatable {
diff --git a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch
index 636535a00f..fff8fb9ff9 100644
--- a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 84ba2076f..3ebc62871 100644
+index 84ba2076..3ebc6287 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -33,7 +33,7 @@ index 84ba2076f..3ebc62871 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index 55debf5d5..8d2999ace 100644
+index 55debf5d..8d2999ac 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java
 +++ b/src/main/java/org/bukkit/plugin/Plugin.java
 @@ -0,0 +0,0 @@ public interface Plugin extends TabExecutor {
diff --git a/Spigot-API-Patches/Async-Chunks-API.patch b/Spigot-API-Patches/Async-Chunks-API.patch
index dd3f964473..90f415e857 100644
--- a/Spigot-API-Patches/Async-Chunks-API.patch
+++ b/Spigot-API-Patches/Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index deabd400..92688252 100644
+index 807bd7fc..61f2cd9a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/AsyncTabCompleteEvent.patch b/Spigot-API-Patches/AsyncTabCompleteEvent.patch
index 0c74b3402b..6a73197407 100644
--- a/Spigot-API-Patches/AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/AsyncTabCompleteEvent.patch
@@ -13,7 +13,7 @@ completion, such as offline players.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 new file mode 100644
-index 000000000..3c51aaf92
+index 00000000..3c51aaf9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 @@ -0,0 +0,0 @@
@@ -186,7 +186,7 @@ index 000000000..3c51aaf92
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index a6229839c..f0bc3563f 100644
+index a6229839..f0bc3563 100644
 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/Check-Paper-versions.patch b/Spigot-API-Patches/Check-Paper-versions.patch
index b908dc8301..8146ae1131 100644
--- a/Spigot-API-Patches/Check-Paper-versions.patch
+++ b/Spigot-API-Patches/Check-Paper-versions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Check Paper versions
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 5a994953b..f38f68640 100644
+index 5a994953..f38f6864 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -0,0 +0,0 @@ import org.json.simple.JSONObject;
diff --git a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
index 33007e652d..ae7cffa54e 100644
--- a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
@@ -10,7 +10,7 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 90d6d50cd..80af6cf52 100644
+index 90d6d50c..80af6cf5 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -22,7 +22,7 @@ index 90d6d50cd..80af6cf52 100644
      }
  
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ea359c540..7347e7464 100644
+index ea359c54..7347e746 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
diff --git a/Spigot-API-Patches/Enderman.teleportRandomly.patch b/Spigot-API-Patches/Enderman.teleportRandomly.patch
index 755706cd0b..0bcb2a42e3 100644
--- a/Spigot-API-Patches/Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/Enderman.teleportRandomly.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index ab827f83..459ec0c9 100644
+index edb49a20..1ea289b5 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
 +++ b/src/main/java/org/bukkit/entity/Enderman.java
 @@ -0,0 +0,0 @@ import org.bukkit.material.MaterialData;
diff --git a/Spigot-API-Patches/EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/EndermanAttackPlayerEvent.patch
index a09f4f1fe1..5f57184fc9 100644
--- a/Spigot-API-Patches/EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/EndermanAttackPlayerEvent.patch
@@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 new file mode 100644
-index 000000000..ab5a7a6b5
+index 00000000..ab5a7a6b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
index 45f909a717..6f6b969fad 100644
--- a/Spigot-API-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/EntityRegainHealthEvent-isFastRegen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 976b80b7e..a5ac3edf3 100644
+index 976b80b7..a5ac3edf 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 @@ -0,0 +0,0 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
diff --git a/Spigot-API-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 319cd54c66..51fe0a8034 100644
--- a/Spigot-API-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index f8c91a13b..c9eb75aa7 100644
+index f8c91a13..c9eb75aa 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 @@ -0,0 +0,0 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
diff --git a/Spigot-API-Patches/Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/Expose-client-protocol-version-and-virtual-host.patch
index ec1386923f..9d3a36828f 100644
--- a/Spigot-API-Patches/Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/Expose-client-protocol-version-and-virtual-host.patch
@@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 new file mode 100644
-index 000000000..9072e384d
+index 00000000..9072e384
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 @@ -0,0 +0,0 @@
@@ -55,7 +55,7 @@ index 000000000..9072e384d
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 45690a2fa..7434203a4 100644
+index bf284f2c..5e65657a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ import org.bukkit.scoreboard.Scoreboard;
diff --git a/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index cb0c74d83b..103b4daeab 100644
--- a/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d4b7c539..f14339af 100644
+index cb7dc068..22704949 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index d4b7c539..f14339af 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b9a75b2d..ce369aa3 100644
+index c4dc1de2..f4f4f291 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/Handle-plugin-prefixes-in-implementation-logging-con.patch
index 043fdf9bd8..f623995bc2 100644
--- a/Spigot-API-Patches/Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/Handle-plugin-prefixes-in-implementation-logging-con.patch
@@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying
 logger names when appropriate.
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 678878064..a81dae439 100644
+index 67887806..a81dae43 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -0,0 +0,0 @@ public abstract class JavaPlugin extends PluginBase {
diff --git a/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
index 55697ea650..bddb5b2bd5 100644
--- a/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
-index fb82104ba..3df8dc6d4 100644
+index fb82104b..3df8dc6d 100644
 --- a/src/main/java/org/bukkit/block/Furnace.java
 +++ b/src/main/java/org/bukkit/block/Furnace.java
 @@ -0,0 +0,0 @@ public interface Furnace extends Container, Nameable {
diff --git a/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
index 92dfd2741b..79838cf69f 100644
--- a/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index ca789867..d4b3caeb 100644
+index b5ed8447..74f5588e 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
index 396d9e81f1..fbdd58514d 100644
--- a/Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 26ab1278b..fb47fc291 100644
+index 26ab1278..fb47fc29 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -0,0 +0,0 @@ package org.bukkit.inventory;
diff --git a/Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
index 81bba460ae..deb5fcc08f 100644
--- a/Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c3cb1247f..26ab1278b 100644
+index c3cb1247..26ab1278 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
diff --git a/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch
index de232aec2e..288c68ed3c 100644
--- a/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 99845e67a..e3bc04e1c 100644
+index 99845e67..e3bc04e1 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ import org.bukkit.World;
diff --git a/Spigot-API-Patches/LivingEntity-setKiller.patch b/Spigot-API-Patches/LivingEntity-setKiller.patch
index 16d1d023b3..0189eef40c 100644
--- a/Spigot-API-Patches/LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/LivingEntity-setKiller.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f67711fd7..3f93b70c1 100644
+index f67711fd..3f93b70c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ import org.bukkit.projectiles.ProjectileSource;
diff --git a/Spigot-API-Patches/LootTable-API.patch b/Spigot-API-Patches/LootTable-API.patch
index f7c97fdde7..102b9cdbfb 100644
--- a/Spigot-API-Patches/LootTable-API.patch
+++ b/Spigot-API-Patches/LootTable-API.patch
@@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object
 
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 new file mode 100644
-index 000000000..9095df616
+index 00000000..9095df61
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
 @@ -0,0 +0,0 @@
@@ -33,7 +33,7 @@ index 000000000..9095df616
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 new file mode 100644
-index 000000000..a389f74c6
+index 00000000..a389f74c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
 @@ -0,0 +0,0 @@
@@ -54,7 +54,7 @@ index 000000000..a389f74c6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 new file mode 100644
-index 000000000..2fc3e8a1c
+index 00000000..2fc3e8a1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
 @@ -0,0 +0,0 @@
@@ -172,7 +172,7 @@ index 000000000..2fc3e8a1c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 new file mode 100644
-index 000000000..2169493d9
+index 00000000..2169493d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
 @@ -0,0 +0,0 @@
@@ -218,7 +218,7 @@ index 000000000..2169493d9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index 815d79a53..b68ab881d 100644
+index 815d79a5..b68ab881 100644
 --- a/src/main/java/org/bukkit/block/Chest.java
 +++ b/src/main/java/org/bukkit/block/Chest.java
 @@ -0,0 +0,0 @@
@@ -238,7 +238,7 @@ index 815d79a53..b68ab881d 100644
      /**
       * Gets the inventory of the chest block represented by this block state.
 diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 2741625db..6d180117e 100644
+index 2741625d..6d180117 100644
 --- a/src/main/java/org/bukkit/block/Dispenser.java
 +++ b/src/main/java/org/bukkit/block/Dispenser.java
 @@ -0,0 +0,0 @@
@@ -258,7 +258,7 @@ index 2741625db..6d180117e 100644
      /**
       * Gets the BlockProjectileSource object for the dispenser.
 diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
-index 2e8c3f711..47737b590 100644
+index 2e8c3f71..47737b59 100644
 --- a/src/main/java/org/bukkit/block/Dropper.java
 +++ b/src/main/java/org/bukkit/block/Dropper.java
 @@ -0,0 +0,0 @@
@@ -277,7 +277,7 @@ index 2e8c3f711..47737b590 100644
      /**
       * Tries to drop a randomly selected item from the dropper's inventory,
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 73fce5f33..221123e8c 100644
+index 73fce5f3..221123e8 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
 @@ -0,0 +0,0 @@
@@ -293,7 +293,7 @@ index 73fce5f33..221123e8c 100644
 -public interface Hopper extends Container, Nameable, Lootable { }
 +public interface Hopper extends Container, Nameable, LootableBlockInventory { } // Paper
 diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 8e061e4a4..1c02c6e1c 100644
+index 8e061e4a..1c02c6e1 100644
 --- a/src/main/java/org/bukkit/block/ShulkerBox.java
 +++ b/src/main/java/org/bukkit/block/ShulkerBox.java
 @@ -0,0 +0,0 @@
@@ -313,7 +313,7 @@ index 8e061e4a4..1c02c6e1c 100644
      /**
       * Get the {@link DyeColor} corresponding to this ShulkerBox
 diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-index 8ced54039..865885501 100644
+index 8ced5403..86588550 100644
 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 @@ -0,0 +0,0 @@
@@ -333,7 +333,7 @@ index 8ced54039..865885501 100644
      /**
       * Checks whether or not this Minecart will pick up 
 diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-index 9ea403e6f..238d118f7 100644
+index 9ea403e6..238d118f 100644
 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
 @@ -0,0 +0,0 @@
@@ -351,7 +351,7 @@ index 9ea403e6f..238d118f7 100644
 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
  }
 diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index f4b3d0215..9f1c830f4 100644
+index f4b3d021..9f1c830f 100644
 --- a/src/main/java/org/bukkit/loot/Lootable.java
 +++ b/src/main/java/org/bukkit/loot/Lootable.java
 @@ -0,0 +0,0 @@ public interface Lootable {
diff --git a/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch
index 30b12bd8f4..1a26d5371c 100644
--- a/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 3f93b70c1..99845e67a 100644
+index 3f93b70c..99845e67 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/Spigot-API-Patches/Material-API-additions.patch b/Spigot-API-Patches/Material-API-additions.patch
index b478898136..55c4a28ab6 100644
--- a/Spigot-API-Patches/Material-API-additions.patch
+++ b/Spigot-API-Patches/Material-API-additions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 14cae61f..39302434 100644
+index 387a0d7c..df5b0d38 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -0,0 +0,0 @@ import org.bukkit.material.MaterialData;
diff --git a/Spigot-API-Patches/Paper-Utils.patch b/Spigot-API-Patches/Paper-Utils.patch
new file mode 100644
index 0000000000..f27bbadf76
--- /dev/null
+++ b/Spigot-API-Patches/Paper-Utils.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 23 Feb 2019 11:26:21 -0500
+Subject: [PATCH] Paper Utils
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
+new file mode 100644
+index 00000000..e5850967
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.util;
++
++public class SneakyThrow {
++
++    public static void sneaky(Throwable exception) {
++        SneakyThrow.<RuntimeException>throwSneaky(exception);
++    }
++
++    @SuppressWarnings("unchecked")
++    private static <T extends Throwable> void throwSneaky(Throwable exception) throws T {
++        throw (T) exception;
++    }
++
++}
+--
\ No newline at end of file
diff --git a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
index b6f8ad38e5..7e029dc54e 100644
--- a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
 new file mode 100644
-index 000000000..3c2b63db4
+index 00000000..3c2b63db
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Title.java
 @@ -0,0 +0,0 @@
@@ -369,7 +369,7 @@ index 000000000..3c2b63db4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fc2d4da89..b57b6981d 100644
+index bf86eb67..959add05 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ package org.bukkit.entity;
diff --git a/Spigot-API-Patches/PlayerReadyArrowEvent.patch b/Spigot-API-Patches/PlayerReadyArrowEvent.patch
index 8f6781a027..b463ba3148 100644
--- a/Spigot-API-Patches/PlayerReadyArrowEvent.patch
+++ b/Spigot-API-Patches/PlayerReadyArrowEvent.patch
@@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
 new file mode 100644
-index 000000000..6fde1e97f
+index 00000000..6fde1e97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/PotionEffect-clone-methods.patch b/Spigot-API-Patches/PotionEffect-clone-methods.patch
index f78b8cf274..55f53a0377 100644
--- a/Spigot-API-Patches/PotionEffect-clone-methods.patch
+++ b/Spigot-API-Patches/PotionEffect-clone-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PotionEffect clone methods
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 86616f1b8..efb55d29c 100644
+index 86616f1b..efb55d29 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -0,0 +0,0 @@ public class PotionEffect implements ConfigurationSerializable {
diff --git a/Spigot-API-Patches/ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/ProfileWhitelistVerifyEvent.patch
index ac42458fad..cf3d056206 100644
--- a/Spigot-API-Patches/ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-API-Patches/ProfileWhitelistVerifyEvent.patch
@@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 new file mode 100644
-index 000000000..b57fff9fb
+index 00000000..b57fff9f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
index ae49f261a3..49ad5a7e91 100644
--- a/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -44,7 +44,7 @@ index 441ed7ad..33cd0ea0 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 301d9418..deabd400 100644
+index e424ed4e..807bd7fc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
index b737f8d12b..02b0c87be5 100644
--- a/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 94647047..06bcee03 100644
+index d62277de..8a0f992f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ import org.bukkit.util.Vector;
diff --git a/Spigot-API-Patches/Use-ASM-for-event-executors.patch b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
index 6e35196535..8866bc17e8 100644
--- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index f8f12595b..84ba2076f 100644
+index f8f12595..84ba2076 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -29,7 +29,7 @@ index f8f12595b..84ba2076f 100644
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..9ff99e3b3
+index 00000000..9ff99e3b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +0,0 @@
@@ -75,7 +75,7 @@ index 000000000..9ff99e3b3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..f60f01005
+index 00000000..bac04fd8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +0,0 @@
@@ -86,8 +86,10 @@ index 000000000..f60f01005
 +import java.lang.reflect.Method;
 +import java.lang.reflect.Modifier;
 +
++import com.destroystokyo.paper.util.SneakyThrow;
 +import com.google.common.base.Preconditions;
 +
++import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.EventException;
 +import org.bukkit.event.Listener;
@@ -113,14 +115,14 @@ index 000000000..f60f01005
 +        if (!eventClass.isInstance(event)) return;
 +        try {
 +            handle.invoke(event);
-+        } catch (Throwable t) {
-+            throw new EventException(t);
++        } catch (Throwable throwable) {
++            SneakyThrow.sneaky(throwable);
 +        }
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 000000000..140cf0ad3
+index 00000000..140cf0ad
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +0,0 @@
@@ -170,7 +172,7 @@ index 000000000..140cf0ad3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 000000000..6941d9fbf
+index 00000000..6941d9fb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +0,0 @@
@@ -208,7 +210,7 @@ index 000000000..6941d9fbf
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 000000000..1473ff8cd
+index 00000000..1473ff8c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +0,0 @@
@@ -277,7 +279,7 @@ index 000000000..1473ff8cd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 000000000..62acbf821
+index 00000000..62acbf82
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +0,0 @@
@@ -315,7 +317,7 @@ index 000000000..62acbf821
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index 3b2c99ea7..b45b6c1c3 100644
+index 3b2c99ea..b11c6ce6 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.Event;
@@ -380,16 +382,9 @@ index 3b2c99ea7..b45b6c1c3 100644
 +            try {
 +                EventExecutor asmExecutor = executorClass.newInstance();
 +                // Define a wrapper to conform to bukkit stupidity (passing in events that don't match and wrapper exception)
-+                return new EventExecutor() {
-+                    @Override
-+                    public void execute(Listener listener, Event event) throws EventException {
-+                        if (!eventClass.isInstance(event)) return;
-+                        try {
-+                            asmExecutor.execute(listener, event);
-+                        } catch (Exception e) {
-+                            throw new EventException(e);
-+                        }
-+                    }
++                return (listener, event) -> {
++                    if (!eventClass.isInstance(event)) return;
++                    asmExecutor.execute(listener, event);
 +                };
 +            } catch (InstantiationException | IllegalAccessException e) {
 +                throw new AssertionError("Unable to initialize generated event executor", e);
@@ -401,7 +396,7 @@ index 3b2c99ea7..b45b6c1c3 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index bf9723029..77207f147 100644
+index bf972302..77207f14 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/Spigot-API-Patches/WitchConsumePotionEvent.patch b/Spigot-API-Patches/WitchConsumePotionEvent.patch
index d37b4617c5..314069e9f2 100644
--- a/Spigot-API-Patches/WitchConsumePotionEvent.patch
+++ b/Spigot-API-Patches/WitchConsumePotionEvent.patch
@@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
 new file mode 100644
-index 000000000..790218998
+index 00000000..79021899
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
 @@ -0,0 +0,0 @@
@@ -77,7 +77,7 @@ index 000000000..790218998
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
 new file mode 100644
-index 000000000..6ef6367b6
+index 00000000..6ef6367b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/WitchReadyPotionEvent.patch b/Spigot-API-Patches/WitchReadyPotionEvent.patch
index 2cfff23c93..78eade8c74 100644
--- a/Spigot-API-Patches/WitchReadyPotionEvent.patch
+++ b/Spigot-API-Patches/WitchReadyPotionEvent.patch
@@ -7,7 +7,7 @@ Control what potion the witch readies to use
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
 new file mode 100644
-index 000000000..0e0c6da71
+index 00000000..0e0c6da7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/ensureServerConversions-API.patch b/Spigot-API-Patches/ensureServerConversions-API.patch
index 3bb99e4bb2..e04432fee8 100644
--- a/Spigot-API-Patches/ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/ensureServerConversions-API.patch
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index ec2b8b8ed..3012aec22 100644
+index ec2b8b8e..3012aec2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -0,0 +0,0 @@ public interface ItemFactory {
@@ -28,7 +28,7 @@ index ec2b8b8ed..3012aec22 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c744799f6..5e8de1152 100644
+index c744799f..5e8de115 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
diff --git a/Spigot-API-Patches/getPlayerUniqueId-API.patch b/Spigot-API-Patches/getPlayerUniqueId-API.patch
index 1598106c47..a27257fcc7 100644
--- a/Spigot-API-Patches/getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bc04472e..bd246827 100644
+index 75634a8d..cbabd807 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index bc04472e..bd246827 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9f3ffb16..5eb1d371 100644
+index 1d1f7784..9c5049cd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/isChunkGenerated-API.patch b/Spigot-API-Patches/isChunkGenerated-API.patch
index da491e4358..247faec308 100644
--- a/Spigot-API-Patches/isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/isChunkGenerated-API.patch
@@ -33,7 +33,7 @@ index 7e1ee875..9457832b 100644
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 1467debe..668c9b7a 100644
+index 30204b98..60b7f2e3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch
index c18c800f5f..ce3f1769b3 100644
--- a/Spigot-Server-Patches/MC-Utils.patch
+++ b/Spigot-Server-Patches/MC-Utils.patch
@@ -4,28 +4,8 @@ Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
 
 
-diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
-new file mode 100644
-index 000000000..e58509675
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java
-@@ -0,0 +0,0 @@
-+package com.destroystokyo.paper.util;
-+
-+public class SneakyThrow {
-+
-+    public static void sneaky(Throwable exception) {
-+        SneakyThrow.<RuntimeException>throwSneaky(exception);
-+    }
-+
-+    @SuppressWarnings("unchecked")
-+    private static <T extends Throwable> void throwSneaky(Throwable exception) throws T {
-+        throw (T) exception;
-+    }
-+
-+}
 diff --git a/src/main/java/net/minecraft/server/AttributeInstance.java b/src/main/java/net/minecraft/server/AttributeInstance.java
-index be179ba21..c53bc8230 100644
+index be179ba213..c53bc8230a 100644
 --- a/src/main/java/net/minecraft/server/AttributeInstance.java
 +++ b/src/main/java/net/minecraft/server/AttributeInstance.java
 @@ -0,0 +0,0 @@ public interface AttributeInstance {
@@ -40,7 +20,7 @@ index be179ba21..c53bc8230 100644
  
      void b(UUID uuid);
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 330f5d0c1..37f9037a2 100644
+index 330f5d0c19..37f9037a22 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -76,7 +56,7 @@ index 330f5d0c1..37f9037a2 100644
              return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1ff78eed4..417c015e5 100644
+index 1ff78eed40..417c015e56 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.CreatureSpawnEvent;
@@ -97,7 +77,7 @@ index 1ff78eed4..417c015e5 100644
      public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index 34586bca6..b0c004b1f 100644
+index 34586bca65..b0c004b1f2 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -0,0 +0,0 @@ public class ChunkCoordIntPair {
@@ -110,7 +90,7 @@ index 34586bca6..b0c004b1f 100644
          return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index cc9604749..70a95c263 100644
+index cc9604749b..70a95c2636 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
@@ -123,7 +103,7 @@ index cc9604749..70a95c263 100644
      private final IChunkLoader e;
      private final IAsyncTaskHandler f;
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index d24ec3d53..9e83610f1 100644
+index d24ec3d53c..9e83610f1a 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -0,0 +0,0 @@ public class DataBits {
@@ -135,7 +115,7 @@ index d24ec3d53..9e83610f1 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java
-index dae40b9cd..2ee879196 100644
+index dae40b9cde..2ee8791963 100644
 --- a/src/main/java/net/minecraft/server/DataPalette.java
 +++ b/src/main/java/net/minecraft/server/DataPalette.java
 @@ -0,0 +0,0 @@ import javax.annotation.Nullable;
@@ -150,7 +130,7 @@ index dae40b9cd..2ee879196 100644
      T a(int i);
  
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 59cbbdcb3..6fcfc5ef7 100644
+index 59cbbdcb3d..6fcfc5ef72 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -0,0 +0,0 @@ import java.util.stream.Collectors;
@@ -192,7 +172,7 @@ index 59cbbdcb3..6fcfc5ef7 100644
          this.b();
          packetdataserializer.writeByte(this.i);
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 372afbe94..20b7c2c6d 100644
+index 372afbe94e..20b7c2c6dc 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -204,7 +184,7 @@ index 372afbe94..20b7c2c6d 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index a3d088bbd..cca047b04 100644
+index 8b2000f683..1a3517aeed 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -216,7 +196,7 @@ index a3d088bbd..cca047b04 100644
          // CraftBukkit start - fire event
          setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 892e1aca7..ed859ccf9 100644
+index 892e1aca7e..ed859ccf95 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -228,7 +208,7 @@ index 892e1aca7..ed859ccf9 100644
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 5f9255df1..5ea517043 100644
+index 5f9255df14..5ea5170436 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -246,7 +226,7 @@ index 5f9255df1..5ea517043 100644
          return SoundCategory.HOSTILE;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index b8abd6363..a07ee150c 100644
+index b8abd6363f..a07ee150c2 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -297,7 +277,7 @@ index b8abd6363..a07ee150c 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 53511f0cc..d1267f3d7 100644
+index 53511f0cc6..d1267f3d72 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -0,0 +0,0 @@ public final class ItemStack {
@@ -328,7 +308,7 @@ index 53511f0cc..d1267f3d7 100644
      }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 000000000..c97e116aa
+index 0000000000..c97e116aaf
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +0,0 @@
@@ -649,7 +629,7 @@ index 000000000..c97e116aa
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 434471215..8c5d6c1d3 100644
+index 434471215d..8c5d6c1d38 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -0,0 +0,0 @@ public class NBTTagCompound implements NBTBase {
@@ -676,7 +656,7 @@ index 434471215..8c5d6c1d3 100644
      public UUID a(String s) {
          return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d85bc522c..e2fc41d6d 100644
+index d85bc522c3..e2fc41d6d1 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -717,7 +697,7 @@ index d85bc522c..e2fc41d6d 100644
          public QueuedPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
              this.a = packet;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 7582151ae..d05f1e02c 100644
+index 7582151ae4..d05f1e02cf 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
@@ -729,7 +709,7 @@ index 7582151ae..d05f1e02c 100644
          for (int j = 1; j < 5; ++j) {
              if ((i & -1 << j * 7) == 0) {
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index d54177bdc..2aa805eef 100644
+index d54177bdcc..2aa805eef1 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -741,7 +721,7 @@ index d54177bdc..2aa805eef 100644
                          throw new SkipEncodeException(throwable);
                      } else {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 395215bbd..f2159bc2d 100644
+index 395215bbdd..f2159bc2dd 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -0,0 +0,0 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -762,7 +742,7 @@ index 395215bbd..f2159bc2d 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d627f975b..08d1b859d 100644
+index 55b4d57af4..a2ec56bc90 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -779,7 +759,7 @@ index d627f975b..08d1b859d 100644
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
 diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java
-index 6740b396a..ea08c5a1c 100644
+index 6740b396a1..ea08c5a1c8 100644
 --- a/src/main/java/net/minecraft/server/PotionUtil.java
 +++ b/src/main/java/net/minecraft/server/PotionUtil.java
 @@ -0,0 +0,0 @@ public class PotionUtil {
@@ -791,7 +771,7 @@ index 6740b396a..ea08c5a1c 100644
          MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry);
  
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index a894f7886..93935e7c7 100644
+index a894f7886d..93935e7c77 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -0,0 +0,0 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -803,7 +783,7 @@ index a894f7886..93935e7c7 100644
          return this.b.size();
      }
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 8cb97b894..5e71d2ac2 100644
+index 8cb97b894a..5e71d2ac27 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -0,0 +0,0 @@ public class SystemUtils {