Allow proto chunks to be saved again

Appear to be used more extensively in 1.14. Subject to further review.
2019-05-30 18:22:34 -05:00 · 2019-05-30 18:22:34 -05:00 · f501069d24
Commit f501069d24
--- a/Spigot-Server-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a05b31f73..79139be38 100644
+index 7f89d45ed..64d1b72a8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -28,7 +28,7 @@ index a05b31f73..79139be38 100644
     public boolean queueHealthUpdatePacket = false;
     public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index af437120e..1eae8057d 100644
+index 0db1e8334..0aafa1b60 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 {
--- a/Spigot-Server-Patches/Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/Add-Heightmap-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6a36c4467..d4789478b 100644
+index 177ea8f4c..a12964f90 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 IIBlockAccess, GeneratorAccess, AutoClose
--- a/Spigot-Server-Patches/Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/Add-LivingEntity-getTargetEntity.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity


 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 4f60b931a1..c950139c0f 100644
+index 4f60b931a..c950139c0 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -0,0 +0,0 @@ public class AxisAlignedBB {
@ -46,7 +46,7 @@ index 4f60b931a1..c950139c0f 100644
         double[] adouble = new double[]{1.0D};
         double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ea4442d76d..6dae950c2d 100644
+index ea4442d76..6dae950c2 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 INamableTileEntity, ICommandListener, Ke
@ -66,7 +66,7 @@ index ea4442d76d..6dae950c2d 100644
         return 0.0F;
     }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ae1cda49aa..17ee1c3eb7 100644
+index ae1cda49a..17ee1c3eb 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 {
@ -108,7 +108,7 @@ index ae1cda49aa..17ee1c3eb7 100644
 
     public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 035d70419d..2ebcbe17ce 100644
+index 035d70419..2ebcbe17c 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -0,0 +0,0 @@ public final class IEntitySelector {
@ -120,7 +120,7 @@ index 035d70419d..2ebcbe17ce 100644
         return !entity.t();
     };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d5c4115a85..c4aa1945ff 100644
+index d5c4115a8..c4aa1945f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
--- a/Spigot-Server-Patches/Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/Add-PlayerConnectionCloseEvent.patch
@ -50,7 +50,7 @@ index 5d46a975e..9e4bc2405 100644
     private SecretKey loginKey;
     private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2c28b97d8..1b0643c27 100644
+index 1652662ae..23fcdea17 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<?>> {
--- a/Spigot-Server-Patches/Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/Add-TNTPrimeEvent.patch
@ -114,7 +114,7 @@ index 013fa3524..7e534417b 100644
                 world.a(blockposition, false);
             }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d42d4e83e..9ada10cc7 100644
+index 0baec5e11..2b39115c9 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.block.CraftBlock;
--- a/Spigot-Server-Patches/Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/Add-Velocity-IP-Forwarding-Support.patch
@ -203,7 +203,7 @@ index d4d752ddb..5d46a975e 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6c5544807..38386d588 100644
+index efd02bd67..c073b04aa 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<?>> {
--- a/Spigot-Server-Patches/Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/Add-hand-to-bucket-events.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events


 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index a17738f9ff..d2c2e3cc33 100644
+index a17738f9f..d2c2e3cc3 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -0,0 +0,0 @@ public class EntityCow extends EntityAnimal {
@ -18,7 +18,7 @@ index a17738f9ff..d2c2e3cc33 100644
             if (event.isCancelled()) {
                 return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index cb28914118..5dc967f8ba 100644
+index cb2891411..5dc967f8b 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -0,0 +0,0 @@ public class ItemBucket extends Item {
@ -67,7 +67,7 @@ index cb28914118..5dc967f8ba 100644
                         ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                         ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 78baaf6253..eec3effef7 100644
+index 78baaf625..eec3effef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {
--- a/Spigot-Server-Patches/Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/Add-more-Witch-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API


 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ae9efb72c..3cbb34a0c 100644
+index 8b95ec3a8..f30ce9568 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -0,0 +0,0 @@
--- a/Spigot-Server-Patches/Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/Add-more-Zombie-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 90923c753..5cc08ca7c 100644
+index c81e53090..48ce15484 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 {
--- a/Spigot-Server-Patches/Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -20,7 +20,7 @@ index fb44fccc9..ad793ffa3 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 07e9abda9..4ba13da1a 100644
+index f30fec7eb..ff45290b8 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 {
--- a/Spigot-Server-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bcbfffb6e0..75285a7b81 100644
+index bcbfffb6e..75285a7b8 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 {
@ -33,7 +33,7 @@ index bcbfffb6e0..75285a7b81 100644
 
     public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8dea7d36b6..d5c4115a85 100644
+index 8dea7d36b..d5c4115a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
--- a/Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch
@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f2ca391bf..2cb3e3696 100644
+index 4409a6ec8..5d1947f82 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@ -57,7 +57,7 @@ index f2ca391bf..2cb3e3696 100644
             return;
         }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7f6e20e4b..a273bec56 100644
+index 7927b69ae..ba40c2be6 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 INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/Add-sun-related-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 11652628b..90923c753 100644
+index c2771c5d9..c81e53090 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 {
@ -17,7 +17,7 @@ index 11652628b..90923c753 100644
         if (this.world.J() && !this.world.isClientSide) {
             float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1f2e2cd87..163d7f37c 100644
+index dbb4eb0a8..d13e4cf73 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 IIBlockAccess, GeneratorAccess, AutoClose
--- a/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch
@ -286,7 +286,7 @@ index e68f90194..ed2ccebb2 100644
 +
 }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 74f102adf..3f7190b6a 100644
+index 871881165..c53518a47 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -0,0 +0,0 @@ public abstract class RegionFileCache implements AutoCloseable {
--- a/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f06bb3ae19..a5b4f99901 100644
+index f06bb3ae1..a5b4f9990 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 {
@ -20,7 +20,7 @@ index f06bb3ae19..a5b4f99901 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index b5b7631919..9157dace14 100644
+index b5b763191..9157dace1 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 {
@ -140,7 +140,7 @@ index b5b7631919..9157dace14 100644
 
     public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 38ca6d6ba5..bcbfffb6e0 100644
+index 38ca6d6ba..bcbfffb6e 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 {
@ -256,7 +256,7 @@ index 38ca6d6ba5..bcbfffb6e0 100644
         float f2 = MathHelper.g(f - this.aK);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92e3..07ce93f17c 100644
+index 9f5c3b92e..07ce93f17 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 {
--- a/Spigot-Server-Patches/Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/Allow-setting-the-vex-s-summoner.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Allow setting the vex's summoner


 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index 83e022c91..c56933068 100644
+index d7bea8389..bcda21ba7 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
@@ -0,0 +0,0 @@ public class EntityVex extends EntityMonster {
--- a/Spigot-Server-Patches/AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/AnvilDamageEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] AnvilDamageEvent


 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index ada5cf982..9e73e731b 100644
+index 88e706f07..abdcd52c4 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -0,0 +0,0 @@ public class ContainerAnvil extends Container {
--- a/Spigot-Server-Patches/BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/BlockDestroyEvent.patch
@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3425f034c..4280fdf80 100644
+index f811ef8cc..032419155 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 IIBlockAccess, GeneratorAccess, AutoClose
--- a/Spigot-Server-Patches/Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/Book-Size-Limits.patch
@ -22,7 +22,7 @@ index a79cba50e..e5e41c662 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a887be15c..baab1a88a 100644
+index 293e5d819..f68693525 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ import java.util.Iterator;
--- a/Spigot-Server-Patches/Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/Break-up-and-make-tab-spam-limits-configurable.patch
@ -45,7 +45,7 @@ index 8c3880c83..d773ef5b0 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c99a321b..07e9abda9 100644
+index b8cd93302..f30fec7eb 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 {
--- a/Spigot-Server-Patches/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e6c894463..ce66596c6 100644
+index eab23bd15..b924f3d76 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 {
--- a/Spigot-Server-Patches/Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/Call-player-spectator-target-events.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Call player spectator target events


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 251166c4f..bf1a38eb9 100644
+index 343680e3b..0e35f6dc2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/Catch-JsonParseException-in-Entity-and-TE-names.patch
@ -26,7 +26,7 @@ index 4b7aefb7a..9e568d5d1 100644
 
         if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index efda90f6e..b63a8ad98 100644
+index a8a3f4838..bcfc5318f 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 INamableTileEntity, ICommandListener, Ke
@ -76,7 +76,7 @@ index 1f26d8a02..12264c4d0 100644
 
         if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 3590b4e31..ea7d5a430 100644
+index 473ec2cbd..ab6b86e4e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
@@ -0,0 +0,0 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
--- a/Spigot-Server-Patches/Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/Check-Drowned-for-Villager-Aggression-Config.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Check Drowned for Villager Aggression Config


 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 0deb51427e..7f34cdbc34 100644
+index 0deb51427..7f34cdbc3 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -0,0 +0,0 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
--- a/Spigot-Server-Patches/ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/ChunkMapDistance-CME.patch
@ -5,7 +5,7 @@ Subject: [PATCH] ChunkMapDistance CME


 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index ba4b9fa59c..d3c2ad3c40 100644
+index ba4b9fa59..d3c2ad3c4 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -0,0 +0,0 @@ public abstract class ChunkMapDistance {
--- a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 385b3ac0ce..b854061983 100644
+index 385b3ac0c..b85406198 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 {
@ -21,7 +21,7 @@ index 385b3ac0ce..b854061983 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f1cd38d421..184f1b00f0 100644
+index f1cd38d42..184f1b00f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -61,7 +61,7 @@ index f1cd38d421..184f1b00f0 100644
         // CraftBukkit start
         // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
-index d6762d3853..7b6f5b2da0 100644
+index d6762d385..7b6f5b2da 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListener.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
@@ -0,0 +0,0 @@ public interface WorldLoadListener {
@ -72,7 +72,7 @@ index d6762d3853..7b6f5b2da0 100644
 +    void setChunkRadius(int radius); // Paper - allow changing chunk radius
 }
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
-index 3868572aed..ae77805f71 100644
+index 3868572ae..ae77805f7 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
@ -103,7 +103,7 @@ index 3868572aed..ae77805f71 100644
     @Override
     public void a(ChunkCoordIntPair chunkcoordintpair) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e9e5ecf747..92aad060ef 100644
+index e9e5ecf74..92aad060e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
@ -148,7 +148,7 @@ index e9e5ecf747..92aad060ef 100644
 
     public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c0207694ac..feb673ae9d 100644
+index c0207694a..feb673ae9 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 {
--- a/Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ffb18902ff..2d3861c184 100644
+index ffb18902f..2d3861c18 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 {
@ -21,7 +21,7 @@ index ffb18902ff..2d3861c184 100644
     private static void savePlayerData() {
         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 07d85e5353..4b76c2d14f 100644
+index 07d85e535..4b76c2d14 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -0,0 +0,0 @@ public class HandshakeListener implements PacketHandshakingInListener {
--- a/Spigot-Server-Patches/Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/Don-t-allow-digging-into-unloaded-chunks.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ff45290b84..293e5d819c 100644
+index ff45290b8..293e5d819 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 {
--- a/Spigot-Server-Patches/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.

 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index daf0aeb43..91c99222d 100644
+index caeaca4c7..dd7889a4f 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
--- a/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 22 Jul 2018 21:21:41 -0400
-Subject: [PATCH] Don't save Proto Chunks
-
-These chunks are unfinished, and waste cpu time saving these unfinished chunks.
-the loadChunk method refuses to acknoledge they exists, and will restart
-a new chunk generation process to begin with, so saving them serves no benefit.
-
-diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9a65c98b9f..85e9db8f4b 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-     }
- 
-     public boolean saveChunk(IChunkAccess ichunkaccess) {
-+        if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.PROTOCHUNK) { return true; } // Paper - don't save proto chunks
-         this.n.a(ichunkaccess.getPos());
-         if (!ichunkaccess.isNeedsSaving()) {
-             return false;
--
--- a/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef882b897f..385b3ac0ce 100644
+index ef882b897..385b3ac0c 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 {
@ -81,7 +81,7 @@ index ef882b897f..385b3ac0ce 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 197c0fe169..ef07f665b7 100644
+index 197c0fe16..ef07f665b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@ -93,7 +93,7 @@ index 197c0fe169..ef07f665b7 100644
 
         int k = MathHelper.floor(entity.locY / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5711cf6647..fffe26939b 100644
+index 5711cf664..fffe26939 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 INamableTileEntity, ICommandListener, Ke
@ -105,7 +105,7 @@ index 5711cf6647..fffe26939b 100644
         this.uniqueID = uuid;
         this.ap = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 85e9db8f4b..aaa634b888 100644
+index 1362099f1..3fdb6935e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -0,0 +0,0 @@
@ -194,7 +194,7 @@ index 85e9db8f4b..aaa634b888 100644
 
                     if (list != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e61381221f..e9e5ecf747 100644
+index e61381221..e9e5ecf74 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
--- a/Spigot-Server-Patches/Elide-lock-in-DataWatcher.patch
+++ b/Spigot-Server-Patches/Elide-lock-in-DataWatcher.patch
@ -17,7 +17,7 @@ of the Entity, the further readlocks are actually
 useless (which get obtained on set, get, etc calls).

 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index f224043d8e..bbea8ef726 100644
+index f224043d8..bbea8ef72 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
@@ -0,0 +0,0 @@ public class DataWatcher {
--- a/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/Entity-getEntitySpawnReason.patch
@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 35ec15b39..7ded9bc6c 100644
+index 6dae950c2..5711cf664 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 INamableTileEntity, ICommandListener, Ke
@ -59,7 +59,7 @@ index 35ec15b39..7ded9bc6c 100644
 
         } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ce66596c6..5645147da 100644
+index b924f3d76..95f309342 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 {
@ -72,7 +72,7 @@ index ce66596c6..5645147da 100644
             });
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9c4ef2e00..1a01e5e69 100644
+index 3c986857b..c93bf8e8b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
--- a/Spigot-Server-Patches/EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/EntityTransformedEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] EntityTransformedEvent


 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index bb3493c14f..de787d8614 100644
+index bb3493c14..de787d861 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -0,0 +0,0 @@ public class EntityMushroomCow extends EntityCow {
@ -17,7 +17,7 @@ index bb3493c14f..de787d8614 100644
 
                     this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index b25f3d1592..fe9efa9da1 100644
+index b25f3d159..fe9efa9da 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 EntityVillagerAbstract implements Reputation
@ -29,7 +29,7 @@ index b25f3d1592..fe9efa9da1 100644
         // CraftBukkit end
         this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 4cb305ff28..171c1ae4ad 100644
+index 4cb305ff2..171c1ae4a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
@ -49,7 +49,7 @@ index 4cb305ff28..171c1ae4ad 100644
             this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
             // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 2fe7fb7889..5cfda3160b 100644
+index 2fe7fb788..5cfda3160 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
--- a/Spigot-Server-Patches/Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/Expose-attack-cooldown-methods-for-Player.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d1a7a873b..2f614dfb6 100644
+index a00b9b209..7d8885ce8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
--- a/Spigot-Server-Patches/Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.

 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 141006e36..78603d2cb 100644
+index b41750f22..d548b27b8 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -0,0 +0,0 @@ public class BlockPiston extends BlockDirectional {
--- a/Spigot-Server-Patches/Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/Fire-event-on-GS4-query.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fire event on GS4 query


 diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
-index 66bfbcf02b..d821ef9a75 100644
+index 66bfbcf02..d821ef9a7 100644
 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
@@ -0,0 +0,0 @@ public abstract class RemoteConnectionThread implements Runnable {
@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644
         return this.b.getPlayerCount();
     }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java
-index a556a71334..67e94a6f07 100644
+index a556a7133..67e94a6f0 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java
@@ -0,0 +0,0 @@ public class RemoteStatusListener extends RemoteConnectionThread {
@ -184,7 +184,7 @@ index a556a71334..67e94a6f07 100644
         }
     }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0e..73efea7e13 100644
+index 848b5c3f0..73efea7e1 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java
@@ -0,0 +0,0 @@ public class RemoteStatusReply {
--- a/Spigot-Server-Patches/Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/Fix-CB-call-to-changed-postToMainThread-method.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5b4576388..e517e9f9f 100644
+index f3f6fa1c4..01c268a58 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 {
--- a/Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ba68d7f833..f1cd38d421 100644
+index ba68d7f83..f1cd38d42 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -29,7 +29,7 @@ index ba68d7f833..f1cd38d421 100644
 
     @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 88b416f600..62cfb6e423 100644
+index 88b416f60..62cfb6e42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
--- a/Spigot-Server-Patches/Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/Fix-MC-124320.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-124320


 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 03d3090b3f..0bddca623e 100644
+index 03d3090b3..0bddca623 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -0,0 +0,0 @@ public class Block implements IMaterial {
@ -17,7 +17,7 @@ index 03d3090b3f..0bddca623e 100644
         IBlockData iblockdata1 = iblockdata;
         BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6db334cb59..5e850db327 100644
+index 6db334cb5..5e850db32 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
--- a/Spigot-Server-Patches/Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/Fix-PlayerEditBookEvent.patch
@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index baab1a88a..f007290ff 100644
+index f68693525..98d1138cb 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 {
--- a/Spigot-Server-Patches/Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/Fix-SpongeAbsortEvent-handling.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed

 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 0bddca623e..8f809a4ee4 100644
+index 0bddca623..8f809a4ee 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -0,0 +0,0 @@ public class Block implements IMaterial {
@ -19,7 +19,7 @@ index 0bddca623e..8f809a4ee4 100644
         if (world instanceof WorldServer) {
             a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 4e281ce6dd..6a64af71b9 100644
+index 4e281ce6d..6a64af71b 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
@@ -0,0 +0,0 @@ public class BlockSponge extends Block {
--- a/Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch
@ -74,7 +74,7 @@ index 363ab5da1..d19a30ad8 100644
                 this.f.add(nbttagcompound);
             }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index f6a80a00f..5306574e5 100644
+index 177cceb77..0882d82ce 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
@@ -0,0 +0,0 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
--- a/Spigot-Server-Patches/Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c93bf8e8b5..e61381221f 100644
+index c93bf8e8b..e61381221 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
--- a/Spigot-Server-Patches/Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/Fix-sign-edit-memory-leak.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 98d1138cbd..b3f1fb9eb2 100644
+index 98d1138cb..b3f1fb9eb 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 {
@ -19,7 +19,7 @@ index 98d1138cbd..b3f1fb9eb2 100644
                 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                 return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 15b3add9ed..caeaca4c7a 100644
+index 15b3add9e..caeaca4c7 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
--- a/Spigot-Server-Patches/Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/Fix-some-generation-concurrency-issues.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix some generation concurrency issues


 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index 6aa0ca3959..ed9b5c63f0 100644
+index 6aa0ca395..ed9b5c63f 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
@ -18,7 +18,7 @@ index 6aa0ca3959..ed9b5c63f0 100644
     private final MinecraftServer d;
     private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a12964f904..7e01731f64 100644
+index a12964f90..7e01731f6 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 IIBlockAccess, GeneratorAccess, AutoClose
@ -46,7 +46,7 @@ index a12964f904..7e01731f64 100644
     public CraftWorld getWorld() {
         return this.world;
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index eca27e52e9..fb3463fcce 100644
+index eca27e52e..fb3463fcc 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
--- a/Spigot-Server-Patches/Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.

 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 816f7ae6b..3064bce49 100644
+index 3ecdd00a1..aac28bfa3 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -0,0 +0,0 @@ public class EntityItemFrame extends EntityHanging {
--- a/Spigot-Server-Patches/Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.

 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 1b0643c27..4766f7b77 100644
+index 23fcdea17..ba23d2833 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<?>> {
--- a/Spigot-Server-Patches/Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/Handle-Large-Packets-disconnecting-client.patch
@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.

 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 38386d588..2c28b97d8 100644
+index c073b04aa..1652662ae 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<?>> {
--- a/Spigot-Server-Patches/Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/Handle-bad-chunks-more-gracefully.patch
@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
 will simply defer to whatever that new behavior is.

 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 3f7190b6a..844f491c7 100644
+index c53518a47..6f34d8aea 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -0,0 +0,0 @@ public abstract class RegionFileCache implements AutoCloseable {
--- a/Spigot-Server-Patches/Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/Here-s-Johnny.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Here's Johnny!


 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index dbd189afe..9d3c37dce 100644
+index 54c1b7c87..130a2e4ff 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -0,0 +0,0 @@ public class EntityVindicator extends EntityIllagerAbstract {
--- a/Spigot-Server-Patches/Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/Ignore-Dead-Entities-in-entityList-iteration.patch
@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index ce190d88d6..352a39dcb3 100644
+index ce190d88d..352a39dcb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -0,0 +0,0 @@ public class PaperCommand extends Command {
@ -23,7 +23,7 @@ index ce190d88d6..352a39dcb3 100644
                     MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                     ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 5d1947f826..197c0fe169 100644
+index 5d1947f82..197c0fe16 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@ -51,7 +51,7 @@ index 5d1947f826..197c0fe169 100644
                 if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                     list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ba40c2be61..6011935dd9 100644
+index ba40c2be6..6011935dd 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 INamableTileEntity, ICommandListener, Ke
@ -63,7 +63,7 @@ index ba40c2be61..6011935dd9 100644
     private float av;
     private float aw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f6ba51d14a..168e19b206 100644
+index f6ba51d14..168e19b20 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
@ -91,7 +91,7 @@ index f6ba51d14a..168e19b206 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4c67f071b1..1adced482b 100644
+index 4c67f071b..1adced482 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 {
--- a/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch
@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions

 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 06b274a71..96d9e8da8 100644
+index 81226d604..b5b763191 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 {
--- a/Spigot-Server-Patches/Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/Implement-PlayerPostRespawnEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5645147da..0e7e47f83 100644
+index 95f309342..47789ee6b 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 {
--- a/Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values


 diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 3a215dea4..ea93452e6 100644
+index 2574c36d3..1c9edeb31 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
@@ -0,0 +0,0 @@ public class ArgumentBlock {
--- a/Spigot-Server-Patches/Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-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/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index be16fe9a9..b9f3a952e 100644
+index 0f6cd246a..c983d260a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -0,0 +0,0 @@ import java.util.Map;
--- a/Spigot-Server-Patches/Improve-death-events.patch
+++ b/Spigot-Server-Patches/Improve-death-events.patch
@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.

 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 84c3ea9d00..f563a7b630 100644
+index 84c3ea9d0..f563a7b63 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
@@ -0,0 +0,0 @@ public class CombatTracker {
@ -27,7 +27,7 @@ index 84c3ea9d00..f563a7b630 100644
         int i = this.f ? 300 : 100;
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4af1482e29..a8a3f48385 100644
+index 4af1482e2..a8a3f4838 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 INamableTileEntity, ICommandListener, Ke
@ -47,7 +47,7 @@ index 4af1482e29..a8a3f48385 100644
 
     protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 9157dace14..235ca47e16 100644
+index 9157dace1..235ca47e1 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 {
@ -61,7 +61,7 @@ index 9157dace14..235ca47e16 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 85b32a8ac9..14046c98db 100644
+index 85b32a8ac..14046c98d 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -0,0 +0,0 @@ public class EntityFox extends EntityAnimal {
@ -94,7 +94,7 @@ index 85b32a8ac9..14046c98db 100644
 
     public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 75285a7b81..dd6e80c6fd 100644
+index 75285a7b8..dd6e80c6f 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 {
@ -249,7 +249,7 @@ index 75285a7b81..dd6e80c6fd 100644
         return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
     }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 30b684b043..343680e3ba 100644
+index 30b684b04..343680e3b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -300,7 +300,7 @@ index 30b684b043..343680e3ba 100644
         }
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09d..9f317ff2e8 100644
+index 73cb64e09..9f317ff2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -0,0 +0,0 @@ public enum CraftSound {
@ -327,7 +327,7 @@ index 73cb64e09d..9f317ff2e8 100644
         this.minecraftKey = minecraftKey;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0386452a8d..deacc21873 100644
+index 0386452a8..deacc2187 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 {
@ -348,7 +348,7 @@ index 0386452a8d..deacc21873 100644
 
     public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index eec3effef7..0d66765591 100644
+index eec3effef..0d6676559 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {
--- a/Spigot-Server-Patches/Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/Limit-Client-Sign-length-more.patch
@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b3f1fb9eb2..5ad28ec748 100644
+index b3f1fb9eb..5ad28ec74 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 {
--- a/Spigot-Server-Patches/Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/Limit-lightning-strike-effect-distance.patch
@ -69,7 +69,7 @@ index adf68d165..fbcda86b3 100644
 
         --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9860175ec..9c4ef2e00 100644
+index d11d01d73..3c986857b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
--- a/Spigot-Server-Patches/MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/MC-111480-Start-Entity-ID-s-at-1.patch
@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1d8b42027..69087c7ef 100644
+index 6011935dd..4af1482e2 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 INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative


 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
-index 418c638d31..2eaed1cd63 100644
+index 418c638d3..2eaed1cd6 100644
 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
@@ -0,0 +0,0 @@ public class EntityAreaEffectCloud extends Entity {
--- a/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.

 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index f692da609..5bc8bd7cd 100644
+index 06ea3899a..7f90a617f 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -0,0 +0,0 @@ public class PlayerInteractManager {
--- a/Spigot-Server-Patches/MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880

 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index c169d0176..55bc4b265 100644
+index 8570e38f4..c97be42dd 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -0,0 +0,0 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@ -23,7 +23,7 @@ index c169d0176..55bc4b265 100644
         this.e = flag;
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1eae8057d..e6c894463 100644
+index 0aafa1b60..eab23bd15 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 {
--- a/Spigot-Server-Patches/Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it


 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7bd5a0a8c..f2ca391bf 100644
+index 98c2de550..4409a6ec8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
--- a/Spigot-Server-Patches/Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/Optimize-BlockPosition-helper-methods.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338

 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index a5e5a4eba..6ed584f8d 100644
+index 93c3fa78f..07b0cc7b1 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 implements MinecraftSeriali
--- a/Spigot-Server-Patches/Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/Optimize-Captured-TileEntity-Lookup.patch
@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4280fdf80..6a36c4467 100644
+index 032419155..177ea8f4c 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 IIBlockAccess, GeneratorAccess, AutoClose
--- a/Spigot-Server-Patches/Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/Optimize-Hoppers.patch
@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5b4f99901..2b5402b009 100644
+index a5b4f9990..2b5402b00 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 {
@ -31,7 +31,7 @@ index a5b4f99901..2b5402b009 100644
     private void disableSprintInterruptionOnAttack() {
         disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ca1bd02995..2d83c9e79c 100644
+index ca1bd0299..2d83c9e79 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 {
@ -47,7 +47,7 @@ index ca1bd02995..2d83c9e79c 100644
         itemstack.d(this.C());
         if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3f2a3dd178..e5c148c481 100644
+index 3f2a3dd17..e5c148c48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -59,7 +59,7 @@ index 3f2a3dd178..e5c148c481 100644
             if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                 this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index acce1788db..5188689fbb 100644
+index acce1788d..5188689fb 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -79,7 +79,7 @@ index acce1788db..5188689fbb 100644
             this.world.b(this.position, this);
             if (!this.c.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index d2833f8842..72b4b19d7a 100644
+index d2833f884..72b4b19d7 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -0,0 +0,0 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
--- a/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ad793ffa38..ef882b897f 100644
+index ad793ffa3..ef882b897 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 {
@ -39,7 +39,7 @@ index ad793ffa38..ef882b897f 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..cf5661f1c5
+index 000000000..cf5661f1c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
@@ -0,0 +0,0 @@
@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 7ce9cdb853..6b5015ce5f 100644
+index 7ce9cdb85..6b5015ce5 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -0,0 +0,0 @@
@ -1124,7 +1124,7 @@ index 7ce9cdb853..6b5015ce5f 100644
                 c(iblockdata, world, blockposition);
                 world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d13e4cf735..f811ef8cc8 100644
+index d13e4cf73..f811ef8cc 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 IIBlockAccess, GeneratorAccess, AutoClose
--- 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
@ -21,7 +21,7 @@ index 83e54cb90..f06bb3ae1 100644
     private void maxEntityCollision() {
         maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f93e3faae..1f2e2cd87 100644
+index 5cf3aea4f..dbb4eb0a8 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 IIBlockAccess, GeneratorAccess, AutoClose
--- a/Spigot-Server-Patches/Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/Per-Player-View-Distance-API-placeholders.patch
@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.

 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 9ada10cc7..5751d39e0 100644
+index 2b39115c9..a248f63f1 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -0,0 +0,0 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@ -23,7 +23,7 @@ index 9ada10cc7..5751d39e0 100644
                     double deltaX = this.locX - player.locX;
                     double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 48b22894a..dbd854206 100644
+index e3feb39ad..5609fcfe0 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -0,0 +0,0 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
--- a/Spigot-Server-Patches/PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/PlayerDeathEvent-getItemsToKeep.patch
@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c7f22870b..21ec45e6f 100644
+index 0a67f48f6..691a2d094 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/Prevent-Enderman-from-loading-chunks.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Prevent Enderman from loading chunks


 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index ad1553f6e..c6a2e0839 100644
+index 5e850db32..d4c4dc2fd 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
--- a/Spigot-Server-Patches/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks


 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 706be9a736..b1457526ec 100644
+index 706be9a73..b1457526e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
@@ -0,0 +0,0 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@ -53,7 +53,7 @@ index 706be9a736..b1457526ec 100644
         return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
     }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index b286934aa8..c7e25e2be8 100644
+index b286934aa..c7e25e2be 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
@@ -0,0 +0,0 @@ public class RandomPositionGenerator {
--- a/Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch
@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.

 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 1ebb16f0f6..2f749fe26a 100644
+index 1ebb16f0f..2f749fe26 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -0,0 +0,0 @@ public class ChunkRegionLoader {
--- a/Spigot-Server-Patches/Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/Prevent-mob-spawning-from-loading-generating-chunks.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds

 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 14e2f3ca7..5824cbba6 100644
+index 5da0f2211..94d7bca09 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -0,0 +0,0 @@ public final class SpawnerCreature {
--- a/Spigot-Server-Patches/Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/Provide-option-to-use-a-versioned-world-folder-for-t.patch
@ -59,7 +59,7 @@ index a9b71c85d..8c3880c83 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 6425b14f2..74f102adf 100644
+index 21b3b06f5..871881165 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.IOException;
--- a/Spigot-Server-Patches/Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/Reset-players-airTicks-on-respawn.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b63a8ad98..e58c68275 100644
+index bcfc5318f..9395f3e10 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 INamableTileEntity, ICommandListener, Ke
@ -18,7 +18,7 @@ index b63a8ad98..e58c68275 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bf1a38eb9..2e068ec2d 100644
+index 0e35f6dc2..2f605365f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/Send-nearby-packets-from-world-player-list-not-serve.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Send nearby packets from world player list not server list


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 006f7b8b9..af437120e 100644
+index e940b4b27..0db1e8334 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 {
@ -46,7 +46,7 @@ index 006f7b8b9..af437120e 100644
                 double d5 = d1 - entityplayer.locY;
                 double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 364f26b55..9860175ec 100644
+index 168e19b20..d11d01d73 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
--- a/Spigot-Server-Patches/Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/Strip-private-area-unicode-characters-from-signs.patch
@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571

 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 626ba9b17..7b5d534f4 100644
+index 2c6ce5bae..15b3add9e 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
--- a/Spigot-Server-Patches/Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/Support-Overriding-World-Seeds.patch
@ -72,7 +72,7 @@ index e5c148c48..74cdf4945 100644
 
             if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 9ecd412ae..eb1464983 100644
+index ace2643be..d4b0cca23 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
@@ -0,0 +0,0 @@ public class WorldData {
--- a/Spigot-Server-Patches/Turtle-API.patch
+++ b/Spigot-Server-Patches/Turtle-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Turtle API


 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 1b4933c07..b7929c5c4 100644
+index 89792eec4..e4eecf568 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
--- a/Spigot-Server-Patches/Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/Update-entity-Metadata-for-all-tracked-players.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Update entity Metadata for all tracked players


 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index afd8748da8..17b6ab57c2 100644
+index afd8748da..17b6ab57c 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -0,0 +0,0 @@ public class EntityTrackerEntry {
@ -22,7 +22,7 @@ index afd8748da8..17b6ab57c2 100644
         this.f.accept(packet);
         if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5ad28ec748..f3f6fa1c45 100644
+index 5ad28ec74..f3f6fa1c4 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 {
--- a/Spigot-Server-Patches/Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/Use-ConcurrentHashMap-in-JsonList.patch
@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code

 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 04f98167d..c169d0176 100644
+index 734e7ecf6..8570e38f4 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -0,0 +0,0 @@ public class JsonList<K, V extends JsonListEntry<K>> {
--- a/Spigot-Server-Patches/Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/Use-Vanilla-Minecart-Speeds.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla

 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 6fc332dbf..828a8711d 100644
+index 2a2105cbc..3a3ed039a 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -0,0 +0,0 @@ public abstract class EntityMinecartAbstract extends Entity {
--- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 41559d3baf..7f6e20e4b9 100644
+index 15315a43e..7927b69ae 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 INamableTileEntity, ICommandListener, Ke
@ -18,7 +18,7 @@ index 41559d3baf..7f6e20e4b9 100644
     protected int j;
     private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index ee22bb0387..e5a013ffd2 100644
+index ee22bb038..e5a013ffd 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -0,0 +0,0 @@ public interface IEntityAccess {
@ -41,7 +41,7 @@ index ee22bb0387..e5a013ffd2 100644
             return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
         });
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 17dac8dfa4..5b422eaa2d 100644
+index 7308c0c31..ed3f793f2 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
@@ -0,0 +0,0 @@ public interface IWorldReader extends IIBlockAccess {
@ -58,7 +58,7 @@ index 17dac8dfa4..5b422eaa2d 100644
 
         return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 59b1e6ce2e..b90cc6652b 100644
+index 59b1e6ce2..b90cc6652 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -0,0 +0,0 @@ public class ItemBlock extends Item {
@ -72,7 +72,7 @@ index 59b1e6ce2e..b90cc6652b 100644
 
         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 309cbd0dc6..78baaf6253 100644
+index 309cbd0dc..78baaf625 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {
--- a/Spigot-Server-Patches/Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 79139be38..c7f22870b 100644
+index 64d1b72a8..0a67f48f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/force-entity-dismount-during-teleportation.patch
@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9395f3e106..ea4442d76d 100644
+index 9395f3e10..ea4442d76 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 INamableTileEntity, ICommandListener, Ke
@ -72,7 +72,7 @@ index 9395f3e106..ea4442d76d 100644
             if (event.isCancelled()) {
                 return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7d8885ce81..318c2b0dcf 100644
+index 7d8885ce8..318c2b0dc 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@ -91,7 +91,7 @@ index 7d8885ce81..318c2b0dcf 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dd6e80c6fd..ae1cda49aa 100644
+index dd6e80c6f..ae1cda49a 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 {
@ -112,7 +112,7 @@ index dd6e80c6fd..ae1cda49aa 100644
             this.B(entity);
         }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2f605365f7..7f89d45ed2 100644
+index 2f605365f..7f89d45ed 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/improve-CraftWorld-isChunkLoaded.patch
@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 63f953617d..c0207694ac 100644
+index 63f953617..c0207694a 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 {