diff --git a/Spigot-Server-Patches/Activation-Range-Improvements.patch b/Spigot-Server-Patches/Activation-Range-Improvements.patch
index 0ea7c4ab9f..f8d9dbc8c7 100644
--- a/Spigot-Server-Patches/Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/Activation-Range-Improvements.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index fdfe5b9e..ce390743 100644
+index fdfe5b9ed..ce3907438 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -0,0 +0,0 @@ public abstract class EntityCreature extends EntityInsentient {
@@ -18,7 +18,7 @@ index fdfe5b9e..ce390743 100644
      private float b;
      private float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b8ac99e5..7242da9c 100644
+index b8ac99e5d..7242da9cc 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 {
@@ -31,7 +31,7 @@ index b8ac99e5..7242da9c 100644
      protected int ticksFarFromPlayer;
      protected float aW;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 13ae7a03..7e3aa6ee 100644
+index 13ae7a030..7e3aa6ee6 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -0,0 +0,0 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -44,7 +44,7 @@ index 13ae7a03..7e3aa6ee 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ac6e2a9a..e6c190d4 100644
+index ac6e2a9aa..e6c190d43 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -57,7 +57,7 @@ index ac6e2a9a..e6c190d4 100644
      Village village;
      private EntityHuman tradingPlayer;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 83d9c43f..1cb6652c 100644
+index 83d9c43f3..1cb6652c2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -0,0 +0,0 @@ public abstract class PathfinderGoal {
@@ -73,7 +73,7 @@ index 83d9c43f..1cb6652c 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index e5b5e988..e3781f3a 100644
+index e5b5e9887..e3781f3a8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -110,7 +110,7 @@ index e5b5e988..e3781f3a 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c8a6ff3d..428912cb 100644
+index c8a6ff3d4..428912cbc 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -0,0 +0,0 @@ import net.minecraft.server.EntityFireball;
diff --git a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
index 3b9853034d..5d7aac3e7d 100644
--- a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 96bb1100..7738ca38 100644
+index 96bb11005..7738ca385 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 96bb1100..7738ca38 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08a..8a06cb16 100644
+index 2b66a08ad..8a06cb165 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/Add-PlayerInitialSpawnEvent.patch
index 5ec07f1c22..dd92c697f5 100644
--- a/Spigot-Server-Patches/Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/Add-PlayerInitialSpawnEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d778eafb3..d6a2bbc08 100644
+index 80bf61164..59c7e78b8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/Add-exception-reporting-event.patch b/Spigot-Server-Patches/Add-exception-reporting-event.patch
index a3ea1bae0a..50bff6c7a0 100644
--- a/Spigot-Server-Patches/Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/Add-exception-reporting-event.patch
@@ -225,7 +225,7 @@ index 8d1b65885..5f9678aad 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 0163a4e59..57d6443cd 100644
+index 6ec72689c..02b9bc8df 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-Server-Patches/Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/Add-fromBottle-flag-to-Experience-Orbs.patch
index 0dbf06224a..bc60e15107 100644
--- a/Spigot-Server-Patches/Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/Add-fromBottle-flag-to-Experience-Orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add fromBottle flag to Experience Orbs
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 14431b8a..54c9200a 100644
+index 14431b8ad..54c9200a9 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
@@ -37,7 +37,7 @@ index 14431b8a..54c9200a 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986f..28931295 100644
+index 0255986fd..289312950 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -0,0 +0,0 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -50,7 +50,7 @@ index 0255986f..28931295 100644
  
              this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3..61e3c6c3 100644
+index 3a09cab3d..61e3c6c3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -0,0 +0,0 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
diff --git a/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
index d5ed28a418..84e8b9b828 100644
--- a/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 009bf0c8..a901cd85 100644
+index 009bf0c8b..a901cd85c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 009bf0c8..a901cd85 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 99466dbd..d1bee025 100644
+index 99466dbde..d1bee0257 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {
diff --git a/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch
index 0592924c32..81e400135f 100644
--- a/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Assign the World in WorldGenStronghold
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index c9375470..a3b958e0 100644
+index c93754704..a3b958e01 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -0,0 +0,0 @@ public class WorldGenStronghold extends StructureGenerator {
diff --git a/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch
index b1baf2e990..07c0992b53 100644
--- a/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 9c1605b1..77236760 100644
+index 9c1605b14..77236760f 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -0,0 +0,0 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 9c1605b1..77236760 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9..1bb172bb 100644
+index 632eb1c9d..1bb172bbf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -0,0 +0,0 @@ public class WorldBorder {
diff --git a/Spigot-Server-Patches/Cap-Entity-Collisions.patch b/Spigot-Server-Patches/Cap-Entity-Collisions.patch
index 38ed151e66..39f0855dd2 100644
--- a/Spigot-Server-Patches/Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61efcc47..4898e8bc 100644
+index 61efcc479..4898e8bce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 61efcc47..4898e8bc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6fcced92..cfeff7c4 100644
+index 6fcced926..cfeff7c48 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
@@ -39,7 +39,7 @@ index 6fcced92..cfeff7c4 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7242da9c..53486e20 100644
+index 7242da9cc..53486e205 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 {
diff --git a/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch
index cb5c560e17..b3eaf8525e 100644
--- a/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ b/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Change Outdated Build Download URL to Paper CI
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 59d4e2e6..e4ec213e 100644
+index 59d4e2e6f..e4ec213e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {
diff --git a/Spigot-Server-Patches/Complete-resource-pack-API.patch b/Spigot-Server-Patches/Complete-resource-pack-API.patch
index 5fa286a7f7..fd24db9f26 100644
--- a/Spigot-Server-Patches/Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/Complete-resource-pack-API.patch
@@ -23,7 +23,7 @@ index 57879c76d..b67837dd2 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d72ff0af2..5fd5e39fa 100644
+index 88fcadbfd..dd8380f71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
index 4e7688e965..72c45cc240 100644
--- a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dcf64efc..bf291680 100644
+index dcf64efcc..bf2916802 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index dcf64efc..bf291680 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 4ad75468..ac6e2a9a 100644
+index 4ad75468c..ac6e2a9aa 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 70ea31d797..212331247a 100644
--- a/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -47,7 +47,7 @@ index 98f2cff15..88437d77a 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 57ae50d2e..0a8e09e5e 100644
+index eb3225ef2..81b9bb884 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index c3c79365a5..f9be95793c 100644
--- a/Spigot-Server-Patches/Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow a zero max height in BiomeJungle
 
 
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index a4e5e493..20c18cdb 100644
+index a4e5e4933..20c18cdbd 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -0,0 +0,0 @@ public class BiomeJungle extends BiomeBase {
@@ -22,7 +22,7 @@ index a4e5e493..20c18cdb 100644
          (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
          WorldGenVines worldgenvines = new WorldGenVines();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6a0b3a62..38a7af58 100644
+index 6a0b3a62d..38a7af58c 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 {
diff --git a/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
index 1aabc3e0b0..2691a2ddb6 100644
--- a/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7738ca38..5818aa5e 100644
+index 7738ca385..5818aa5e9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 7738ca38..5818aa5e 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 53486e20..9b715945 100644
+index 53486e205..9b7159450 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 {
diff --git a/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
index 7a5875dc73..dbe9b42e83 100644
--- a/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1e295432..6fcced92 100644
+index 1e295432e..6fcced926 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
deleted file mode 100644
index de2087b48a..0000000000
--- a/Spigot-Server-Patches/Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 2 Mar 2016 23:51:51 -0600
-Subject: [PATCH] Don't create Region File's when checking if chunk exists
-
-Plugins like Dynmap can end up creating tons of emtpy Region Files
-when using chunkExists.
-
-diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 6ec72689c..0163a4e59 100644
---- a/src/main/java/net/minecraft/server/RegionFileCache.java
-+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
-@@ -0,0 +0,0 @@ public class RegionFileCache {
- 
-     public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
- 
-+    // Paper start
-     public static synchronized RegionFile a(File file, int i, int j) {
-+        return a(file, i, j, true);
-+    }
-+
-+    public static synchronized RegionFile a(File file, int i, int j, boolean create) {
-+        // Paper end
-         File file1 = new File(file, "region");
-         File file2 = new File(file1, "r." + (i >> 5) + "." + (j >> 5) + ".mca");
-         RegionFile regionfile = (RegionFile) RegionFileCache.a.get(file2);
-@@ -0,0 +0,0 @@ public class RegionFileCache {
-         if (regionfile != null) {
-             return regionfile;
-         } else {
-+            if (!create && !file2.exists()) { return null; } // Paper
-             if (!file1.exists()) {
-                 file1.mkdirs();
-             }
---
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch
index 2a9003eec5..4eca5dd83b 100644
--- a/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b4207470..b837a921 100644
+index b42074706..b837a921c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/Firework-API-s.patch b/Spigot-Server-Patches/Firework-API-s.patch
index a4dfb85c4d..7b3e64d8fa 100644
--- a/Spigot-Server-Patches/Firework-API-s.patch
+++ b/Spigot-Server-Patches/Firework-API-s.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 572f4dea..f9cf382b 100644
+index 572f4dead..f9cf382b2 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 572f4dea..f9cf382b 100644
  
      public boolean aV() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 4fc36d24..5cd68bfa 100644
+index 4fc36d243..5cd68bfaf 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -0,0 +0,0 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index 4fc36d24..5cd68bfa 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 2a2f53c8..266741fc 100644
+index 2a2f53c82..266741fcd 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 extends NBTBase {
@@ -86,7 +86,7 @@ index 2a2f53c8..266741fc 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3c..d4fbe31d 100644
+index 99746b3c2..d4fbe31d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch
index 327c50e4a7..6855ef942a 100644
--- a/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch
@@ -22,7 +22,7 @@ index 3db29161d..98f2cff15 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 54b454fe3..57ae50d2e 100644
+index dd37bec73..eb3225ef2 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index 2438c8a6f9..47afc180dd 100644
--- a/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
 Thanks @gabizou
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 45ebd3f6..cf204f41 100644
+index 548da18e0..29902769f 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 {
diff --git a/Spigot-Server-Patches/Fix-block-break-desync.patch b/Spigot-Server-Patches/Fix-block-break-desync.patch
index 8ce74a72c3..f5638ed841 100644
--- a/Spigot-Server-Patches/Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/Fix-block-break-desync.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 70af4ebb..0e2f43b9 100644
+index 70af4ebbb..0e2f43b96 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 {
diff --git a/Spigot-Server-Patches/Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/Fix-inter-world-teleportation-glitches.patch
index 5791999224..3d7c904569 100644
--- a/Spigot-Server-Patches/Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/Fix-inter-world-teleportation-glitches.patch
@@ -25,7 +25,7 @@ index 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0e7086da3..d72ff0af2 100644
+index 0df01186f..88fcadbfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/Fix-reducedDebugInfo-not-initialized-on-client.patch
index 69f62652ec..8dd545a875 100644
--- a/Spigot-Server-Patches/Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d6a2bbc08..b8d48b45c 100644
+index 59c7e78b8..e303b45f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/IllegalPacketEvent.patch b/Spigot-Server-Patches/IllegalPacketEvent.patch
index 69b8298d98..8aa36c0f5f 100644
--- a/Spigot-Server-Patches/IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/IllegalPacketEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 51d27351..43757500 100644
+index 51d27351d..437575003 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
index 12b688c51d..607cc8058b 100644
--- a/Spigot-Server-Patches/MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
+++ b/Spigot-Server-Patches/MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
@@ -11,7 +11,7 @@ This breaks the ability to rename more than 1 item at a time.
 See: https://bugs.mojang.com/browse/MC-111699
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c2d43ac..cbe5d36d 100644
+index 7c2d43ac2..cbe5d36d0 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 {
diff --git a/Spigot-Server-Patches/MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/MC-112017-Allow-31-instead-of-30-for-item-names.patch
index 3f7e4e8ce4..de1b59ce9a 100644
--- a/Spigot-Server-Patches/MC-112017-Allow-31-instead-of-30-for-item-names.patch
+++ b/Spigot-Server-Patches/MC-112017-Allow-31-instead-of-30-for-item-names.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cbe5d36d..70af4ebb 100644
+index cbe5d36d0..70af4ebbb 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 {
diff --git a/Spigot-Server-Patches/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 5dee2ec4e3..825ed16e59 100644
--- a/Spigot-Server-Patches/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7006466b..c32fb3ef 100644
+index dabe4137f..fb4f11958 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/Optimize-Chunk-Access.patch b/Spigot-Server-Patches/Optimize-Chunk-Access.patch
index 85a7988b76..e36116d6bc 100644
--- a/Spigot-Server-Patches/Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/Optimize-Chunk-Access.patch
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b0a82e7ed..a7e8a3f7d 100644
+index 0ad57afba..b49f4e292 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
index a7f240ac66..d03857c2eb 100644
--- a/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 911bd879..45ebd3f6 100644
+index aca63be53..548da18e0 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 {
diff --git a/Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 3c9b552e1c..6a46e60cf4 100644
--- a/Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bf291680..61efcc47 100644
+index bf2916802..61efcc479 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index bf291680..61efcc47 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7af76e14..2028cf81 100644
+index 7af76e14c..2028cf81e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch
index 0a7ead2ed4..f1d8689124 100644
--- a/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/Player-Tab-List-and-Title-APIs.patch
@@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 16dcaba3f..0e7086da3 100644
+index c86a48070..0df01186f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch
index 5e3eb56136..15be882f94 100644
--- a/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 065d0bbf..ea8992d7 100644
+index 065d0bbfc..ea8992d72 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -0,0 +0,0 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
index 1b48953ef3..089b785824 100644
--- a/Spigot-Server-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-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/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3f8859a1..b4207470 100644
+index 3f8859a1f..b42074706 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch
index 4010ef69be..017949a1e9 100644
--- a/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/Reduce-IO-ops-opening-a-new-region-file.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce IO ops opening a new region file.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 9cfc46bc2..637e5baaf 100644
+index ed840dbc9..4008a2143 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@ import java.io.ByteArrayInputStream;
diff --git a/Spigot-Server-Patches/Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/Remove-CraftScheduler-Async-Task-Debugger.patch
index 6f4d58df5d..bb3c3674cb 100644
--- a/Spigot-Server-Patches/Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e30cfb7b..448c27cc 100644
+index e30cfb7b7..448c27cc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/Spigot-Server-Patches/Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/Remove-the-Vanilla-Method-Profiler.patch
index 8d328a1983..e63004d26c 100644
--- a/Spigot-Server-Patches/Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/Remove-the-Vanilla-Method-Profiler.patch
@@ -11,7 +11,7 @@ added, so we do not want any risk of performance degredation.
 Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior.
 
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index fe58d428..938f62f8 100644
+index fe58d428f..938f62f83 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -0,0 +0,0 @@ public class CommandDebug extends CommandAbstract {
@@ -40,7 +40,7 @@ index fe58d428..938f62f8 100644
  
      public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java
-index 65465291..27698348 100644
+index 654652916..276983485 100644
 --- a/src/main/java/net/minecraft/server/MethodProfiler.java
 +++ b/src/main/java/net/minecraft/server/MethodProfiler.java
 @@ -0,0 +0,0 @@ import java.util.List;
diff --git a/Spigot-Server-Patches/Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/Sanitise-RegionFileCache-and-make-configurable.patch
index 1a2bc5acf3..8964c6f87a 100644
--- a/Spigot-Server-Patches/Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/Sanitise-RegionFileCache-and-make-configurable.patch
@@ -25,7 +25,7 @@ index 6907d4680..c3ff47e00 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 19fbf9b4a..ad00c39ce 100644
+index 02b9bc8df..91b55074e 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@ import java.io.File;
@@ -40,8 +40,8 @@ index 19fbf9b4a..ad00c39ce 100644
 -    public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
 +    public static final Map<File, RegionFile> a = new LinkedHashMap(PaperConfig.regionFileCacheSize, 0.75f, true); // Spigot - private -> public, Paper - HashMap -> LinkedHashMap
  
-     // Paper start
      public static synchronized RegionFile a(File file, int i, int j) {
+         File file1 = new File(file, "region");
 @@ -0,0 +0,0 @@ public class RegionFileCache {
                  file1.mkdirs();
              }
diff --git a/Spigot-Server-Patches/Shame-on-you-Mojang.patch b/Spigot-Server-Patches/Shame-on-you-Mojang.patch
index 43cd891193..1a7de84dcb 100644
--- a/Spigot-Server-Patches/Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/Shame-on-you-Mojang.patch
@@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?
 
 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index f44f0562..74c37117 100644
+index f44f05620..74c371179 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
 @@ -0,0 +0,0 @@ public class BlockBeacon extends BlockTileEntity {
diff --git a/Spigot-Server-Patches/ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/ShulkerBox-Dupe-Prevention.patch
index 5d342d49f0..1704157cd4 100644
--- a/Spigot-Server-Patches/ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/ShulkerBox-Dupe-Prevention.patch
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index fcb1a6c6..12fb8163 100644
+index fcb1a6c66..12fb81635 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -0,0 +0,0 @@ public class BlockShulkerBox extends BlockTileEntity {
diff --git a/Spigot-Server-Patches/String-based-Action-Bar-API.patch b/Spigot-Server-Patches/String-based-Action-Bar-API.patch
index 72e385443e..ee6381a2ab 100644
--- a/Spigot-Server-Patches/String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 1159eea1..38359517 100644
+index 1159eea1a..38359517c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +0,0 @@
@@ -62,7 +62,7 @@ index 1159eea1..38359517 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 233903b5..a5703447 100644
+index 61c32223d..072b59125 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/Use-Optimized-Collections.patch b/Spigot-Server-Patches/Use-Optimized-Collections.patch
index bdfa739eb0..577247587f 100644
--- a/Spigot-Server-Patches/Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/Use-Optimized-Collections.patch
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a7e8a3f7d..54b454fe3 100644
+index b49f4e292..dd37bec73 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.world.ChunkUnloadEvent;
diff --git a/Spigot-Server-Patches/Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/Workaround-for-setting-passengers-on-players.patch
index 2ccc5e26f4..fa16e581a0 100644
--- a/Spigot-Server-Patches/Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/Workaround-for-setting-passengers-on-players.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 80a6a0b41..5f6b182d6 100644
+index 0a9e8b9cd..8e06c2140 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/handle-NaN-health-absorb-values-and-repair-bad-data.patch
index f921f88cb1..5227c79353 100644
--- a/Spigot-Server-Patches/handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,7 +44,7 @@ index 9cb3b22fb..c70f14a15 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5fd5e39fa..80a6a0b41 100644
+index dd8380f71..0a9e8b9cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {