Stop loading entity bounding boxes from NBT

This may be creating more issues than it's solving cc GH-1806
2024-12-29 07:48:53 +01:00 · 2019-03-15 23:25:32 -04:00 · 2019-03-15 23:25:32 -04:00 · c3c889523f
commit c3c889523f
parent bf2be652f0
77 changed files with 362 additions and 454 deletions
--- a/Spigot-Server-Patches/0348-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0348-Improve-death-events.patch
@ -1,4 +1,4 @@
-From 154abb777432d6276f3cf162439ed29cdb0e9d5b Mon Sep 17 00:00:00 2001
+From f05d395c6e8180d13072d112c53de2e40b5cbc7a Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@ -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 bbd5e2b2a..19750ceed 100644
+index bbd5e2b2..19750cee 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
@@ -175,6 +175,7 @@ public class CombatTracker {
@ -27,7 +27,7 @@ index bbd5e2b2a..19750ceed 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 6b65c6942..9eb280adc 100644
+index c29d7eeb..acd89649 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1553,6 +1553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -38,7 +38,7 @@ index 6b65c6942..9eb280adc 100644
     public void a(Entity entity, int i, DamageSource damagesource) {
         if (entity instanceof EntityPlayer) {
             CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2421,6 +2422,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2405,6 +2406,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
         this.fallDistance = 0.0F;
     }
 
@ -46,7 +46,7 @@ index 6b65c6942..9eb280adc 100644
     public void b(EntityLiving entityliving) {}
 
     protected boolean i(double d0, double d1, double d2) {
-@@ -3086,6 +3088,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3069,6 +3071,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
         return EnumPistonReaction.NORMAL;
     }
 
@ -55,7 +55,7 @@ index 6b65c6942..9eb280adc 100644
         return SoundCategory.NEUTRAL;
     }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 2c54e3e34..a5cc5e284 100644
+index 2c54e3e3..a5cc5e28 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -659,7 +659,8 @@ public class EntityArmorStand extends EntityLiving {
@ -69,7 +69,7 @@ index 2c54e3e34..a5cc5e284 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 381f19144..56191d1f2 100644
+index 10d95d30..f48ddbc6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
@ -206,7 +206,7 @@ index 381f19144..56191d1f2 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 13409c041..b01fffbd6 100644
+index 13409c04..b01fffbd 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -72,6 +72,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -257,7 +257,7 @@ index 13409c041..b01fffbd6 100644
         }
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 17fab031b..ee8219e3b 100644
+index 17fab031..ee8219e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -674,6 +674,22 @@ public enum CraftSound {
@ -284,7 +284,7 @@ index 17fab031b..ee8219e3b 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 07b9545e7..a2eae5d10 100644
+index 07b9545e..a2eae5d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1686,7 +1686,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -305,7 +305,7 @@ index 07b9545e7..a2eae5d10 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 93da4c726..054ebc82b 100644
+index 93da4c72..054ebc82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -600,9 +600,16 @@ public class CraftEventFactory {
--- a/Spigot-Server-Patches/0348-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
+++ b/Spigot-Server-Patches/0348-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
@ -1,92 +0,0 @@
-From 12af6ff48e20ae7c665a665d8ffef0b398fcf5a0 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 4 Sep 2018 19:07:57 -0400
-Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
-
-What follows is a summarized analysis provided on the Mojira and associated subreddit by various MC community members
-who have investigated this issue and found a solution. This work is largely a result of their efforts.
-
-The underlying cause of MC-2025 is that sometimes an AABB ends up slightly smaller than the desired width. If this
-happens before the entity is pushed up against a boundary (i.e. blocks or walls), then upon chunk save and reload, the
-AABB size will be recomputed such that it is intersecting the wall, allowing the entity to be pushed into the wall,
-suffocate, and die. Although the rounding artifacts get larger at larger world coordinates, the drift we see is
-miniscule. Closer to the world origin, we have seen error on the order of 2-46. Compare this to the fact that
-(due to MC-4), entity coordinates send to clients are quantized to multiples of 1/4096 (2-12).
-
-But, OMG, do the rounding errors mean that AABB's accumulate shrinkage over time? Actually, no. The statistics on IEEE
-rounding do not have that kind of bias. What has not been stated is that the AABB is just as likely to end up larger
-than the expected width; on save and reload, the entity ends up slightly away from the wall, and we don't notice any
-problem. In reality, the AABB size ends up undergoing random wobble around the expected value all the time, and that
-wobble isn't functionally any different from the kind we'd get even if we tried to force the AABB size to be stable!
-
-This reasoning leads us to one clear conclusion: The simplest, least invasive, and most correct solution is to just
-store the AABB in NBT data on chunk save and restore the AABB exactly as it was saved upon reload.
-
-diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 1c0b783e8..c5e541985 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
-+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-@@ -5,12 +5,12 @@ import javax.annotation.Nullable;
- 
- public class AxisAlignedBB {
- 
-    public final double minX;
-    public final double minY;
-    public final double minZ;
-    public final double maxX;
-    public final double maxY;
-    public final double maxZ;
-+    public final double minX; public double getMinX() { return this.minX; } // Paper - OBFHELPER
-+    public final double minY; public double getMinY() { return this.minY; } // Paper - OBFHELPER
-+    public final double minZ; public double getMinZ() { return this.minZ; } // Paper - OBFHELPER
-+    public final double maxX; public double getMaxX() { return this.maxX; } // Paper - OBFHELPER
-+    public final double maxY; public double getMaxY() { return this.maxY; } // Paper - OBFHELPER
-+    public final double maxZ; public double getMaxZ() { return this.maxZ; } // Paper - OBFHELPER
- 
-     public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) {
-         this.minX = Math.min(d0, d3);
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c29d7eeb0..6b65c6942 100644
--- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1673,6 +1673,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             if (spawnedViaMobSpawner) {
-                 nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
-             }
-+            // Paper start - MC-2025 fix - Save entity AABB and load it, floating point issues recalculating AABB can result in wobble
-+            AxisAlignedBB boundingBox = this.getBoundingBox();
-+            nbttagcompound.set("Paper.AAAB", this.createList(
-+                boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(),
-+                boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ()
-+            ));
-             // Paper end
-             return nbttagcompound;
-         } catch (Throwable throwable) {
-@@ -1762,6 +1768,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             if (this.aD()) {
-                 this.setPosition(this.locX, this.locY, this.locZ);
-             }
-+            // Paper start - MC-2025 fix - Save entity AABB and load it, floating point issues recalculating AABB can result in wobble
-+            // Placement is important, always after the setPosition call above
-+            if (nbttagcompound.hasKey("Paper.AABB")) {
-+                NBTTagList savedBB = nbttagcompound.getList("Paper.AABB", 6);
-+                this.setBoundingBox(new AxisAlignedBB(
-+                    savedBB.getDoubleAt(0), savedBB.getDoubleAt(1), savedBB.getDoubleAt(2),
-+                    savedBB.getDoubleAt(3), savedBB.getDoubleAt(4), savedBB.getDoubleAt(5)
-+                ));
-+            }
-+            // Paper end
- 
-             // CraftBukkit start
-             if (this instanceof EntityLiving) {
-@@ -2830,6 +2846,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-         return this.boundingBox;
-     }
- 
-+    public void setBoundingBox(AxisAlignedBB axisAlignedBB) { this.a(axisAlignedBB); } // Paper - OBFHELPER
-     public void a(AxisAlignedBB axisalignedbb) {
-         // CraftBukkit start - block invalid bounding boxes
-         double minX = axisalignedbb.minX,
-- 
-2.20.1
-
--- a/Spigot-Server-Patches/0349-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0349-Allow-chests-to-be-placed-with-NBT-data.patch
@ -1,11 +1,11 @@
-From 84161d23970b062dacae0e45f3cc86f783700c07 Mon Sep 17 00:00:00 2001
+From e8a80b8dec63ed62949d118e9f74763ab0371910 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data


 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 914da48a2..7827f692a 100644
+index 914da48a..7827f692 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -232,6 +232,15 @@ public final class ItemStack {
@ -25,7 +25,7 @@ index 914da48a2..7827f692a 100644
                     for (BlockState blockstate : blocks) {
                         blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index c46b761cc..2e0f782f6 100644
+index c46b761c..2e0f782f 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
@@ -305,7 +305,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
--- a/Spigot-Server-Patches/0350-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0350-Mob-Pathfinding-API.patch
@ -1,4 +1,4 @@
-From 043b98e4a753bdae0ea34258f276ce82c75cc8c7 Mon Sep 17 00:00:00 2001
+From 04eb4f00597dc827d2f0456d57cd3aa05c8209a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@ -7,7 +7,7 @@ Implements Pathfinding API for mobs

 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 000000000..ed3d86ddd
+index 00000000..ed3d86dd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
@@ -0,0 +1,113 @@
@ -125,7 +125,7 @@ index 000000000..ed3d86ddd
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index c55aadb53..cac0ce2a3 100644
+index c55aadb5..cac0ce2a 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
@ -173,7 +173,7 @@ index c55aadb53..cac0ce2a3 100644
         this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
         this.c = null;
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index 31fc1fbc6..5cf7f3bf1 100644
+index 31fc1fbc..5cf7f3bf 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@ -212,7 +212,7 @@ index 31fc1fbc6..5cf7f3bf1 100644
 
         return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index 78ed00286..0dd6e46d1 100644
+index 78ed0028..0dd6e46d 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
@@ -2,9 +2,9 @@ package net.minecraft.server;
@ -229,7 +229,7 @@ index 78ed00286..0dd6e46d1 100644
     public int d = -1;
     public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06f..53c2d154e 100644
+index 5bf1cd06..53c2d154 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
--- a/Spigot-Server-Patches/0351-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0351-Prevent-chunk-loading-from-Fluid-Flowing.patch
@ -1,11 +1,11 @@
-From 658dd490f11f1972b72d33202dba2fa69acbeae2 Mon Sep 17 00:00:00 2001
+From e47fdafef79250649c2397bbae1ac496f5c21339 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing


 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 28edf37d0..bbffeae3d 100644
+index 28edf37d..bbffeae3 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
@@ -185,7 +185,8 @@ public abstract class FluidTypeFlowing extends FluidType {
--- a/Spigot-Server-Patches/0352-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0352-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@ -1,11 +1,11 @@
-From 89c8d117a2fcbd18993ccee91b3c658eb9f7d5c7 Mon Sep 17 00:00:00 2001
+From 5f03d3715663e41e0f125b390d049597ae3f9b03 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 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 8e8390282..f52936581 100644
+index 8e839028..f5293658 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
@@ -43,7 +43,7 @@ public class ArgumentBlock {
@ -32,7 +32,7 @@ index 8e8390282..f52936581 100644
         this.s = this::l;
         if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index eaf4cd11c..be2e736eb 100644
+index eaf4cd11..be2e736e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -81,6 +81,12 @@ import javax.annotation.Nullable;
@ -412,5 +412,5 @@ index eaf4cd11c..be2e736eb 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0353-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0353-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@ -1,11 +1,11 @@
-From 03b201f14bedd7e8358726164b2793c1a363bc98 Mon Sep 17 00:00:00 2001
+From f8791854c3591f360b7a0504758a4d085d1421d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 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 2b15aa6c9..3ca32123b 100644
+index 2b15aa6c..3ca32123 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
@@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@ -53,7 +53,7 @@ index 2b15aa6c9..3ca32123b 100644
         return block == this.f && 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 e58fdee8b..f2c4048c2 100644
+index e58fdee8..f2c4048c 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
@@ -87,6 +87,7 @@ public class RandomPositionGenerator {
@ -74,7 +74,7 @@ index e58fdee8b..f2c4048c2 100644
     }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1e51f2bb6..1e030783b 100644
+index 9edcf025..9bfc5db3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -764,7 +764,17 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/0354-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0354-Prevent-mob-spawning-from-loading-generating-chunks.patch
@ -1,4 +1,4 @@
-From 706dbd57e4fe49d668ff31fa4e728d50502046c7 Mon Sep 17 00:00:00 2001
+From 3a21e15af95e705091cba51e225bef7976099f53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
@ -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 bfbe4d3e3..e2bf17f44 100644
+index bfbe4d3e..e2bf17f4 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -129,9 +129,9 @@ public final class SpawnerCreature {
--- a/Spigot-Server-Patches/0355-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0355-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@ -1,4 +1,4 @@
-From 890535d3714a533dbcb0fb189aefd8c661e64f8e Mon Sep 17 00:00:00 2001
+From 4539ea74a006aca6d91f2ede339b6ef5ccd0ebc1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.

 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index c399bdecc..3496d4236 100644
+index c399bdec..3496d423 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -120,7 +120,7 @@ public abstract class BiomeBase {
--- a/Spigot-Server-Patches/0356-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0356-Optimize-and-Fix-ExpiringMap-Issues.patch
@ -1,4 +1,4 @@
-From 1d10c30c13027d091b99b887f8fc6753efd9c2f6 Mon Sep 17 00:00:00 2001
+From e77fa35159c7442a3db6d0d2720d79251f546ab5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
@ -14,7 +14,7 @@ manipulation, and instead to run clean
 once per tick per active expiring map.

 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
-index a23768441..835a2aae4 100644
+index a2376844..835a2aae 100644
 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
@@ -142,13 +142,13 @@ public abstract class ChunkGeneratorAbstract<C extends GeneratorSettings> implem
@ -34,7 +34,7 @@ index a23768441..835a2aae4 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java
-index bd3636479..bf6095137 100644
+index bd363647..bf609513 100644
 --- a/src/main/java/net/minecraft/server/ExpiringMap.java
 +++ b/src/main/java/net/minecraft/server/ExpiringMap.java
@@ -2,87 +2,211 @@ package net.minecraft.server;
@ -290,7 +290,7 @@ index bd3636479..bf6095137 100644
 +    */ // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41c9dccab..6138c14ea 100644
+index 38c0201a..ae271a57 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -150,6 +150,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -310,7 +310,7 @@ index 41c9dccab..6138c14ea 100644
         co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 4cca65666..9c917370a 100644
+index 4cca6566..9c917370 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
@@ -144,7 +144,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
--- a/Spigot-Server-Patches/0357-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0357-Implement-furnace-cook-speed-multiplier-API.patch
@ -1,4 +1,4 @@
-From ce84fff2cc5efef101f4e678e479598f96f37a2c Mon Sep 17 00:00:00 2001
+From 63604288438d194578ec4a25a30621359c3ab1a2 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
@ -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 5b6ccfa9f..bfbd35bbe 100644
+index 5b6ccfa9..bfbd35bb 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -9,6 +9,7 @@ import java.util.Map.Entry;
@ -57,7 +57,7 @@ index 5b6ccfa9f..bfbd35bbe 100644
                         this.cookTimeTotal = this.s();
                         this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index c2eea8ce0..429c780ec 100644
+index c2eea8ce..429c780e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
@@ -84,4 +84,18 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F
--- a/Spigot-Server-Patches/0358-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0358-Support-Overriding-World-Seeds.patch
@ -1,4 +1,4 @@
-From c28d1e14a5d3297db12189b3e60a4c8f97456483 Mon Sep 17 00:00:00 2001
+From 92271a7287dabd8017118bb3613b9f3cd72bf056 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6bd59a886..359c538f3 100644
+index 6bd59a88..359c538f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@ -59,7 +59,7 @@ index 6bd59a886..359c538f3 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6138c14ea..5393a11db 100644
+index ae271a57..4543ac8f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -345,7 +345,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -72,7 +72,7 @@ index 6138c14ea..5393a11db 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 8458dc17d..b5fb95293 100644
+index 8458dc17..b5fb9529 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
@@ -110,7 +110,7 @@ public class WorldData {
@ -85,7 +85,7 @@ index 8458dc17d..b5fb95293 100644
             String s = nbttagcompound.getString("generatorName");
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 81e27949d..6cea317d5 100644
+index 81e27949..6cea317d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -989,7 +989,7 @@ public final class CraftServer implements Server {
--- a/Spigot-Server-Patches/0359-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0359-Optimize-Server-World-Map.patch
@ -1,4 +1,4 @@
-From 2cade16ed21794df62ac84298f79558ab8c409fe Mon Sep 17 00:00:00 2001
+From 99aed7981b3c903e0eb2ed8f30cf6841f790bd35 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 000000000..af9e4455c
+index 00000000..af9e4455
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
@@ -0,0 +1,191 @@
@ -217,7 +217,7 @@ index 000000000..af9e4455c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5393a11db..68743a6b7 100644
+index 4543ac8f..d2ee4e57 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -82,7 +82,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
--- a/Spigot-Server-Patches/0360-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0360-PreSpawnerSpawnEvent.patch
@ -1,4 +1,4 @@
-From b786a93c3796a21b2fa34735dd126abf5ff0da1e Mon Sep 17 00:00:00 2001
+From 6677b8f49c32012202a9c7a81ff49b75005af42d Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.

 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index eca3f85ad..b2d2de7f8 100644
+index eca3f85a..b2d2de7f 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -102,11 +102,11 @@ public abstract class MobSpawnerAbstract {
--- a/Spigot-Server-Patches/0361-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0361-Catch-JsonParseException-in-Entity-and-TE-names.patch
@ -1,4 +1,4 @@
-From e2134922812ac0a55ced3de651c438a1dca6f241 Mon Sep 17 00:00:00 2001
+From c3a96e4a3c00ed9609639b3137f6a99f24ffed98 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.

 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index e38a0d488..a245df1dc 100644
+index e38a0d48..a245df1d 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
@@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@ -26,10 +26,10 @@ index e38a0d488..a245df1dc 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 9eb280adc..a4c5b0b5b 100644
+index acd89649..49ddb971 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1748,7 +1748,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1742,7 +1742,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
             this.setPosition(this.locX, this.locY, this.locZ);
             this.setYawPitch(this.yaw, this.pitch);
             if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
@ -39,7 +39,7 @@ index 9eb280adc..a4c5b0b5b 100644
 
             this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 0ef5ad116..f70f5899f 100644
+index 0ef5ad11..f70f5899 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -339,4 +339,19 @@ public final class MCUtil {
@ -63,7 +63,7 @@ index 0ef5ad116..f70f5899f 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 7d9e0837d..dfee7332e 100644
+index 7d9e0837..dfee7332 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
@@ -74,7 +74,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@ -76,7 +76,7 @@ index 7d9e0837d..dfee7332e 100644
 
         if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
-index a106a783e..ff8a5926e 100644
+index a106a783..ff8a5926 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
@@ -236,7 +236,7 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl
@ -89,7 +89,7 @@ index a106a783e..ff8a5926e 100644
 
         this.fuelLevel = nbttagcompound.getByte("Fuel");
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 2e0f782f6..77c012946 100644
+index 2e0f782f..77c01294 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
@@ -83,7 +83,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@ -102,7 +102,7 @@ index 2e0f782f6..77c012946 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/TileEntityDispenser.java b/src/main/java/net/minecraft/server/TileEntityDispenser.java
-index ddd2e0eb0..21bd156e9 100644
+index ddd2e0eb..21bd156e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityDispenser.java
 +++ b/src/main/java/net/minecraft/server/TileEntityDispenser.java
@@ -107,7 +107,7 @@ public class TileEntityDispenser extends TileEntityLootable {
@ -115,7 +115,7 @@ index ddd2e0eb0..21bd156e9 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index bfbd35bbe..538ca9bbb 100644
+index bfbd35bb..538ca9bb 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -217,7 +217,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve
@ -128,7 +128,7 @@ index bfbd35bbe..538ca9bbb 100644
 
         // Paper start - cook speed API
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 7303a6fdd..544dde428 100644
+index 7303a6fd..544dde42 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -60,7 +60,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -141,7 +141,7 @@ index 7303a6fdd..544dde428 100644
 
         this.f = nbttagcompound.getInt("TransferCooldown");
 diff --git a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
-index fedba2e1f..296b8dd56 100644
+index fedba2e1..296b8dd5 100644
 --- a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
@@ -249,7 +249,7 @@ public class TileEntityShulkerBox extends TileEntityLootable implements IWorldIn
--- a/Spigot-Server-Patches/0362-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0362-Avoid-dimension-id-collisions.patch
@ -1,4 +1,4 @@
-From d153419e11223422645a7e0879c6c87fda1a8a8e Mon Sep 17 00:00:00 2001
+From 67ed56157ed7757e00c1b6e66d1c51970d5b0e4a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cea317d5..fac42f8e5 100644
+index 6cea317d..fac42f8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -975,7 +975,7 @@ public final class CraftServer implements Server {
--- a/Spigot-Server-Patches/0363-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0363-Honor-EntityAgeable.ageLock.patch
@ -1,11 +1,11 @@
-From ea16edc8618b7b13c00efceabda8bc2d2b932cfd Mon Sep 17 00:00:00 2001
+From f23346c138dc50657cb7342f8a71f557e12fc581 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock


 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 2af1ac702..aa54e380e 100644
+index 2af1ac70..aa54e380 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature {
--- a/Spigot-Server-Patches/0364-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0364-Async-Chunk-Loading-and-Generation.patch
@ -1,4 +1,4 @@
-From f645c65426b1c050e692e50fe2088047aeb8d462 Mon Sep 17 00:00:00 2001
+From 9864f7559ec6beef68f585618d990862853de7dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 359c538f32..942520088e 100644
+index 359c538f..94252008 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -376,4 +376,57 @@ public class PaperConfig {
@ -106,7 +106,7 @@ index 359c538f32..942520088e 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 new file mode 100644
-index 0000000000..8f18c28695
+index 00000000..8f18c286
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
@@ -0,0 +1,347 @@
@ -458,7 +458,7 @@ index 0000000000..8f18c28695
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1d006bad16..a002aabf31 100644
+index 9f28d777..fb00e7a9 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -190,6 +190,7 @@ public class Chunk implements IChunkAccess {
@ -470,7 +470,7 @@ index 1d006bad16..a002aabf31 100644
 
         Iterator iterator = protochunk.s().iterator();
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 2021c0d02e..154ab09e0c 100644
+index 2021c0d0..154ab09e 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -562,7 +562,7 @@ index 2021c0d02e..154ab09e0c 100644
 
     public void putAll(Map<? extends Long, ? extends Chunk> map) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 186cfda7e4..781e068770 100644
+index 186cfda7..781e0687 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -33,12 +33,12 @@ public class ChunkProviderServer implements IChunkProvider {
@ -713,7 +713,7 @@ index 186cfda7e4..781e068770 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d938eb3749..51df075b44 100644
+index d938eb37..51df075b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -119,7 +119,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -740,7 +740,7 @@ index d938eb3749..51df075b44 100644
                 completion = new Supplier<NBTTagCompound>() {
                     public NBTTagCompound get() {
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 2af07ae592..9c6844d441 100644
+index 2af07ae5..9c6844d4 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -25,7 +25,17 @@ public class ChunkSection {
@ -762,7 +762,7 @@ index 2af07ae592..9c6844d441 100644
     public IBlockData getType(int i, int j, int k) {
         return (IBlockData) this.blockIds.a(i, j, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index d3898599f8..8f061f5ca3 100644
+index d3898599..8f061f5c 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -17,13 +17,14 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@ -833,7 +833,7 @@ index d3898599f8..8f061f5ca3 100644
 
     protected ProtoChunk a(ChunkCoordIntPair chunkcoordintpair, ChunkStatus chunkstatus, Map<ChunkCoordIntPair, ProtoChunk> map) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 454903a0e7..dcbcb655c5 100644
+index 454903a0..dcbcb655 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
@@ -3,7 +3,7 @@ package net.minecraft.server;
@ -921,7 +921,7 @@ index 454903a0e7..dcbcb655c5 100644
 
     // Paper start - Anti-Xray - Support default methods
 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index f5a6387f27..f456850997 100644
+index f5a6387f..f4568509 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
@ -934,7 +934,7 @@ index f5a6387f27..f456850997 100644
     private final MinecraftServer d;
     private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a4c5b0b5b5..b572e535ac 100644
+index 49ddb971..ec54a77e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -207,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -947,7 +947,7 @@ index a4c5b0b5b5..b572e535ac 100644
         this.aJ = Sets.newHashSet();
         this.aL = new double[] { 0.0D, 0.0D, 0.0D};
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 4698ee99f8..dfb45cc4ea 100644
+index 4698ee99..dfb45cc4 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
@@ -6,6 +6,8 @@ import javax.annotation.Nullable;
@ -960,7 +960,7 @@ index 4698ee99f8..dfb45cc4ea 100644
     Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
 
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 8bb2593aa9..67bb289545 100644
+index 8bb2593a..67bb2895 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
@@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@ -981,7 +981,7 @@ index 8bb2593aa9..67bb289545 100644
         f %= 360.0F;
         if (f >= 180.0F) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d2ee4e5781..236fbafeb5 100644
+index d2ee4e57..236fbafe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -499,6 +499,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -1071,7 +1071,7 @@ index d2ee4e5781..236fbafeb5 100644
             i = SystemUtils.getMonotonicNanos();
 diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 new file mode 100644
-index 0000000000..851756d65e
+index 00000000..851756d6
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
@@ -0,0 +1,658 @@
@ -1734,7 +1734,7 @@ index 0000000000..851756d65e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 240f590666..e4cf8548d3 100644
+index 240f5906..e4cf8548 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -22,6 +22,52 @@ public class PlayerChunk {
@ -1832,7 +1832,7 @@ index 240f590666..e4cf8548d3 100644
         }
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 679488a3cf..b7dda8e282 100644
+index 679488a3..b7dda8e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -25,10 +25,10 @@ public class PlayerChunkMap {
@ -1892,7 +1892,7 @@ index 679488a3cf..b7dda8e282 100644
 
     private void e() {
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index de6dd4fed7..da6df06d84 100644
+index de6dd4fe..da6df06d 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
@@ -34,7 +34,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@ -1905,7 +1905,7 @@ index de6dd4fed7..da6df06d84 100644
         this.m = world.getChunkProvider().getChunkGenerator().getSettings();
         this.i = world.getSeaLevel();
 diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java
-index 8e909d9caf..f214a74a29 100644
+index 8e909d9c..f214a74a 100644
 --- a/src/main/java/net/minecraft/server/SchedulerBatch.java
 +++ b/src/main/java/net/minecraft/server/SchedulerBatch.java
@@ -10,6 +10,7 @@ public class SchedulerBatch<K, T extends SchedulerTask<K, T>, R> {
@ -1960,7 +1960,7 @@ index 8e909d9caf..f214a74a29 100644
     }
 }
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index d9def71353..945a005e90 100644
+index d9def713..945a005e 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
@@ -16,7 +16,7 @@ public abstract class StructurePiece {
@ -1995,7 +1995,7 @@ index d9def71353..945a005e90 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index 284e96710a..8b08efe1f4 100644
+index 284e9671..8b08efe1 100644
 --- a/src/main/java/net/minecraft/server/StructureStart.java
 +++ b/src/main/java/net/minecraft/server/StructureStart.java
@@ -7,7 +7,7 @@ import java.util.Random;
@ -2056,7 +2056,7 @@ index 284e96710a..8b08efe1f4 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9bfc5db39e..2224eeab27 100644
+index 9bfc5db3..2224eeab 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -41,7 +41,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -2153,7 +2153,7 @@ index 9bfc5db39e..2224eeab27 100644
         if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
         if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index 69d8a25bdf..d0eaa9e9f8 100644
+index 69d8a25b..d0eaa9e9 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
@@ -10,23 +10,28 @@ import javax.annotation.Nullable;
@ -2306,7 +2306,7 @@ index 69d8a25bdf..d0eaa9e9f8 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0ff3fe03dd..9b5509dce3 100644
+index 0ff3fe03..9b5509dc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -714,7 +714,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -2319,7 +2319,7 @@ index 0ff3fe03dd..9b5509dce3 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fac42f8e5c..59b1628e5a 100644
+index fac42f8e..59b1628e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1021,8 +1021,12 @@ public final class CraftServer implements Server {
@ -2347,7 +2347,7 @@ index fac42f8e5c..59b1628e5a 100644
             }
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 95fe3a91bf..b5a87cfaf6 100644
+index 95fe3a91..b5a87cfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -163,6 +163,16 @@ public class CraftWorld implements World {
@ -2385,7 +2385,7 @@ index 95fe3a91bf..b5a87cfaf6 100644
                     if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
                         unloadChunk(chunkCoordX + x, chunkCoordZ + z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 054ebc82bd..2e0b4de83b 100644
+index 054ebc82..2e0b4de8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -82,6 +82,7 @@ public class CraftEventFactory {
@ -2447,7 +2447,7 @@ index 054ebc82bd..2e0b4de83b 100644
 
         if (!event.isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 9c917370ae..a299092a58 100644
+index 9c917370..a299092a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
@@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
--- a/Spigot-Server-Patches/0365-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0365-Ignore-Dimension-NBT-field-in-Entity-data.patch
@ -1,4 +1,4 @@
-From 3983e746ec445141b55bd3fc7d7d2cfa9d987b13 Mon Sep 17 00:00:00 2001
+From d9fb849b3a42d42d8e8f5adb76fd920356ad1f02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@ -14,10 +14,10 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b572e535a..66947e307 100644
+index ec54a77e..235061e5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1735,7 +1735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1729,7 +1729,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
             this.setAirTicks(nbttagcompound.getShort("Air"));
             this.onGround = nbttagcompound.getBoolean("OnGround");
             if (nbttagcompound.hasKey("Dimension")) {
--- a/Spigot-Server-Patches/0366-Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/0366-Optimize-Light-Recalculations.patch
@ -1,4 +1,4 @@
-From c446c78ca3b39921088a44176c07bac9e3ddcfd9 Mon Sep 17 00:00:00 2001
+From 67fe79d4d74bde2b956929fe8a6cdaa004941068 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 20:46:29 -0400
 Subject: [PATCH] Optimize Light Recalculations
@ -14,7 +14,7 @@ Also optimizes to not repeatedly look up the same chunk for
 light lookups.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e042040557..0b54b7d789 100644
+index e0420405..0b54b7d7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -523,6 +523,11 @@ public class PaperWorldConfig {
@ -30,7 +30,7 @@ index e042040557..0b54b7d789 100644
     public boolean asynchronous;
     public EngineMode engineMode;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a002aabf31..1cb9030dab 100644
+index fb00e7a9..fdf062b8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -353,7 +353,7 @@ public class Chunk implements IChunkAccess {
@ -52,7 +52,7 @@ index a002aabf31..1cb9030dab 100644
                     int i1 = iblockdata.b(this.world, blockposition);
                     int j1 = iblockdata1.b(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2224eeab27..57de5f48ab 100644
+index 2224eeab..57de5f48 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -591,8 +591,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/0367-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0367-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@ -1,4 +1,4 @@
-From de96d474f37638ea81fa17ffb7ee63afaa065a4a Mon Sep 17 00:00:00 2001
+From 6723dd0a77f187b859456ff1883d09c1808a5d70 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@ -18,7 +18,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/World.java b/src/main/java/net/minecraft/server/World.java
-index 5dc32a6e5..21cfcb50d 100644
+index 57de5f48..2e48ea9d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1081,7 +1081,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
--- a/Spigot-Server-Patches/0368-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0368-Don-t-recheck-type-after-setting-a-block.patch
@ -1,4 +1,4 @@
-From a111fb20c93bfda239f9d016af976be54578c4cb Mon Sep 17 00:00:00 2001
+From e8663937dae1f009fa3239bc11bf399907acb416 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
@ -16,7 +16,7 @@ be having data corruption issues anyways.
 This provides a small boost to all setType calls.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index cd7b6318f..52e2b9db5 100644
+index fdf062b8..d848a97b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -558,7 +558,7 @@ public class Chunk implements IChunkAccess {
--- a/Spigot-Server-Patches/0369-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0369-Fix-Sending-Chunks-to-Client.patch
@ -1,4 +1,4 @@
-From f77344fd44771590c6650a2a25d6187f899a1416 Mon Sep 17 00:00:00 2001
+From 1185ba108dd399f393c33d77e62614a88b47f7c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates
 the client anytime post processing is triggered with the new chunk data.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 52e2b9db5..e61fefa4c 100644
+index d848a97b..2bcbf890 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1189,7 +1189,7 @@ public class Chunk implements IChunkAccess {
@ -41,7 +41,7 @@ index 52e2b9db5..e61fefa4c 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index e4cf8548d..ac5d15809 100644
+index e4cf8548..ac5d1580 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -20,7 +20,7 @@ public class PlayerChunk {
--- a/Spigot-Server-Patches/0370-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0370-Configurable-connection-throttle-kick-message.patch
@ -1,11 +1,11 @@
-From fd6d094c2c09f273ce9522b07d762e813f877e96 Mon Sep 17 00:00:00 2001
+From 23a156f8cf3e5bafb9b227d7399826a89c280485 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 942520088..7f9845d92 100644
+index 94252008..7f9845d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -296,6 +296,11 @@ public class PaperConfig {
@ -21,7 +21,7 @@ index 942520088..7f9845d92 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 e732d55f9..2c594b437 100644
+index e732d55f..2c594b43 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -37,7 +37,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
--- a/Spigot-Server-Patches/0371-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0371-Fix-FileIOThread-concurrency-issues.patch
@ -1,4 +1,4 @@
-From 82543b7c5049dcf93e1fe54803a6d48590f196ea Mon Sep 17 00:00:00 2001
+From 64d408a45a717c918eaa13eb35dfdd18749b4f3f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
@ -9,7 +9,7 @@ issues when this counter is updated from multiple threads, potentially
 causing these counters to desync due to the unsafe volatile update

 diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
-index 3c688f546..570624600 100644
+index 3c688f54..57062460 100644
 --- a/src/main/java/net/minecraft/server/FileIOThread.java
 +++ b/src/main/java/net/minecraft/server/FileIOThread.java
@@ -10,7 +10,7 @@ public class FileIOThread implements Runnable {
--- a/Spigot-Server-Patches/0372-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0372-Hook-into-CB-plugin-rewrites.patch
@ -1,4 +1,4 @@
-From 618e38761582c4edf8cb2a43fe0fe4299f85b4cc Mon Sep 17 00:00:00 2001
+From 81fbf50c8d0955b62922dc6bec23b07ecb7f7a82 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.

 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 632df2270..b66323220 100644
+index 632df227..b6632322 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
@@ -6,7 +6,9 @@ import java.io.FileOutputStream;
@ -187,5 +187,5 @@ index 632df2270..b66323220 100644
                         {
                             if ( owner.equals( "org/bukkit/Material" ) )
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0373-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0373-Allow-setting-the-vex-s-summoner.patch
@ -1,11 +1,11 @@
-From f65b131de4960742e16503f54cdbaa00e252d706 Mon Sep 17 00:00:00 2001
+From 7e894443dba510006b373b213ec731f1fedd0b62 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner


 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index c3864b869..589b13f4e 100644
+index c3864b86..589b13f4 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
@@ -127,6 +127,7 @@ public class EntityVex extends EntityMonster {
@ -17,7 +17,7 @@ index c3864b869..589b13f4e 100644
         this.b = entityinsentient;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index c96a5df80..b09da64c3 100644
+index c96a5df8..b09da64c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
@@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
@ -32,5 +32,5 @@ index c96a5df80..b09da64c3 100644
 
     @Override
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0374-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0374-Add-LivingEntity-getTargetEntity.patch
@ -1,11 +1,11 @@
-From 1389043974ddcad9244bc0da76131f1617acd772 Mon Sep 17 00:00:00 2001
+From 6a11280367803c2734c81a10614fc312848d9a65 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity


 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index c5e541985..d6a5c7407 100644
+index 1c0b783e..dad1ff73 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -95,6 +95,7 @@ public class AxisAlignedBB {
@ -46,7 +46,7 @@ index c5e541985..d6a5c7407 100644
     public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
         return this.a(vec3d, vec3d1, (BlockPosition) null);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 66947e307..2f27af7f6 100644
+index 235061e5..a8271457 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1533,6 +1533,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -57,7 +57,7 @@ index 66947e307..2f27af7f6 100644
     public Vec3D i(float f) {
         if (f == 1.0F) {
             return new Vec3D(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ);
-@@ -2196,10 +2197,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2180,10 +2181,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
         return this.bP().size() < 1;
     }
 
@ -71,7 +71,7 @@ index 66947e307..2f27af7f6 100644
         return this.d(this.pitch, this.yaw);
     }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f48ddbc68..1023505d1 100644
+index f48ddbc6..1023505d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@ -130,7 +130,7 @@ index f48ddbc68..1023505d1 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 f6916fd45..71f08d53c 100644
+index f6916fd4..71f08d53 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -19,6 +19,7 @@ public final class IEntitySelector {
@ -142,7 +142,7 @@ index f6916fd45..71f08d53c 100644
         return !(entity instanceof EntityHuman) || !((EntityHuman) entity).isSpectator();
     };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index eeab59379..d6a4bc64a 100644
+index eeab5937..d6a4bc64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -186,6 +186,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -180,5 +180,5 @@ index eeab59379..d6a4bc64a 100644
 
     public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0375-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0375-Add-sun-related-API.patch
@ -1,11 +1,11 @@
-From 33a5df37206b4248b9222b910d76b8db5b416717 Mon Sep 17 00:00:00 2001
+From a345370612d8ad6ee6aa975fbc3db18140d6bca8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index ee5078370..3059682a4 100644
+index ee507837..3059682a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1287,6 +1287,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,7 +17,7 @@ index ee5078370..3059682a4 100644
         if (this.world.L() && !this.world.isClientSide) {
             float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2e48ea9d8..a21de9b3d 100644
+index 2e48ea9d..a21de9b3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -29,7 +29,7 @@ index 2e48ea9d8..a21de9b3d 100644
         return this.G < 4;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b5a87cfaf..e33135ada 100644
+index b5a87cfa..e33135ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -538,6 +538,12 @@ public class CraftWorld implements World {
@ -46,7 +46,7 @@ index b5a87cfaf..e33135ada 100644
         return createExplosion(x, y, z, power, false, true);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154e..40a429942 100644
+index 53c2d154..40a42994 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@ -61,5 +61,5 @@ index 53c2d154e..40a429942 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0376-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0376-Check-Drowned-for-Villager-Aggression-Config.patch
@ -1,11 +1,11 @@
-From b7a4b50fde9a7975ccacc28736b603b50700ca2d Mon Sep 17 00:00:00 2001
+From f58f52b643f0bec4dd78717763661725135e78ab Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config


 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index b861c623c..0e2b5ee74 100644
+index b861c623..0e2b5ee7 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -28,7 +28,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@ -18,5 +18,5 @@ index b861c623c..0e2b5ee74 100644
         this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bC));
     }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0377-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0377-Here-s-Johnny.patch
@ -1,11 +1,11 @@
-From 42f526586cf29b7db63d23fa91b0ccdb37d26fc7 Mon Sep 17 00:00:00 2001
+From efe8887222bbaa943dbb8911f8e6f122c14b4231 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!


 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 96d0651e9..4bbb4817b 100644
+index 96d0651e..4bbb4817 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@ -18,7 +18,7 @@ index 96d0651e9..4bbb4817b 100644
         return entity instanceof EntityLiving && ((EntityLiving) entity).df();
     };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d47929..5ff957ced 100644
+index 951d4792..5ff957ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
@@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
@ -37,5 +37,5 @@ index 951d47929..5ff957ced 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0378-Turtle-API.patch
+++ b/Spigot-Server-Patches/0378-Turtle-API.patch
@ -1,11 +1,11 @@
-From 87e673dd88d661f1de4ac358769da08aff8f5abd Mon Sep 17 00:00:00 2001
+From f31db13e73d14dafe62daec6f5e40913d7e6d67f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API


 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index b016e0ae7..a533e0eb5 100644
+index b016e0ae..a533e0eb 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@ -103,7 +103,7 @@ index b016e0ae7..a533e0eb5 100644
 
         public void c() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75c..8edcf7af6 100644
+index 123a2c75..8edcf7af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
@@ -1,6 +1,8 @@
@ -153,5 +153,5 @@ index 123a2c75c..8edcf7af6 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0379-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0379-Limit-lightning-strike-effect-distance.patch
@ -1,11 +1,11 @@
-From f569811682d4be7e7783f352c23de594dd0f32fa Mon Sep 17 00:00:00 2001
+From 964e75e95495b3a5bf17b16e75cd28cf33973c6b Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0b54b7d78..d723868fc 100644
+index 0b54b7d7..d723868f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -237,6 +237,28 @@ public class PaperWorldConfig {
@ -38,7 +38,7 @@ index 0b54b7d78..d723868fc 100644
     public boolean firePhysicsEventForRedstone = false;
     private void firePhysicsEventForRedstone() {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 7781babf5..50f620009 100644
+index 7781babf..50f62000 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
@@ -60,6 +60,17 @@ public class EntityLightning extends EntityWeather {
@ -69,7 +69,7 @@ index 7781babf5..50f620009 100644
 
         --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9b5509dce..409b50744 100644
+index 9b5509dc..409b5074 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1064,7 +1064,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -82,5 +82,5 @@ index 9b5509dce..409b50744 100644
         } else {
             return false;
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0380-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0380-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@ -1,4 +1,4 @@
-From d9afae9a218f029fd0fb7d16214686903b85b578 Mon Sep 17 00:00:00 2001
+From 91d24825a64315344a24600d6cd738657e1e434a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and


 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6752d0b8c..03fee65e4 100644
+index 6752d0b8..03fee65e 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -411,20 +411,22 @@ public class EntityItem extends Entity {
@ -37,7 +37,7 @@ index 6752d0b8c..03fee65e4 100644
         this.f = uuid;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 6036592f7..4128ba4c0 100644
+index 6036592f..4128ba4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
@ -78,5 +78,5 @@ index 6036592f7..4128ba4c0 100644
 
     @Override
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0381-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0381-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@ -1,4 +1,4 @@
-From 69de585cad7ca8533b859968de165919d6844aad Mon Sep 17 00:00:00 2001
+From da643cd82cac0e15987a55314c547a9b521e66df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.

 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 62b5b6ece..60ab1c751 100644
+index 62b5b6ec..60ab1c75 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -250,11 +250,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@ -38,5 +38,5 @@ index 62b5b6ece..60ab1c751 100644
         }
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0382-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0382-Call-player-spectator-target-events.patch
@ -1,11 +1,11 @@
-From c911ad34ef16a86c2943ab87bdc97e688572d60c Mon Sep 17 00:00:00 2001
+From 5dc59a29f82965dee60bcb9abb87b7ed4f23f836 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b01fffbd6..5757e1288 100644
+index b01fffbd..5757e128 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -59,7 +59,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -59,5 +59,5 @@ index b01fffbd6..5757e1288 100644
 
     protected void E() {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0383-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0383-Add-Velocity-IP-Forwarding-Support.patch
@ -1,4 +1,4 @@
-From 5c5cb283667d1e7c6d6489042d74c11be98246f3 Mon Sep 17 00:00:00 2001
+From 467f615bb7164bb81908ae9b7feef88292c52d5f Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7f9845d92..52ce8f89e 100644
+index 7f9845d9..52ce8f89 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -8,6 +8,7 @@ import java.io.IOException;
@ -55,7 +55,7 @@ index 7f9845d92..52ce8f89e 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 000000000..fdd8708f9
+index 00000000..fdd8708f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
@@ -0,0 +1,67 @@
@ -127,7 +127,7 @@ index 000000000..fdd8708f9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c5801122d..ca76f2a38 100644
+index c5801122..ca76f2a3 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -203,7 +203,7 @@ index c5801122d..ca76f2a38 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 4c1110479..c53697914 100644
+index 4c111047..c5369791 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -216,7 +216,7 @@ index 4c1110479..c53697914 100644
     public java.util.UUID spoofedUUID;
     public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index b95836d44..621aad150 100644
+index b95836d4..621aad15 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
@@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@ -244,7 +244,7 @@ index b95836d44..621aad150 100644
         int j = this.g();
 
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index bdac03da4..430445cc6 100644
+index bdac03da..430445cc 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
@@ -4,8 +4,8 @@ import java.io.IOException;
@ -259,7 +259,7 @@ index bdac03da4..430445cc6 100644
     public PacketLoginInCustomPayload() {}
 
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index 345843a7f..23c96f44b 100644
+index 345843a7..23c96f44 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
@@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@ -278,5 +278,5 @@ index 345843a7f..23c96f44b 100644
         this.a = packetdataserializer.g();
         this.b = packetdataserializer.l();
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0384-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0384-Add-more-Witch-API.patch
@ -1,11 +1,11 @@
-From acfbf3d5c429ad4a3a2849f087484e005550754e Mon Sep 17 00:00:00 2001
+From b946529179cda9cab9cb4bb37ba16e404c8940ff Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API


 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index feedfc9d9..955e0e19b 100644
+index feedfc9d..955e0e19 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -1,5 +1,11 @@
@ -94,7 +94,7 @@ index feedfc9d9..955e0e19b 100644
         f = super.applyMagicModifier(damagesource, f);
         if (damagesource.getEntity() == this) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index f25998eb6..ac465bda2 100644
+index f25998eb..ac465bda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
@@ -6,6 +6,13 @@ import org.bukkit.craftbukkit.CraftServer;
@ -136,5 +136,5 @@ index f25998eb6..ac465bda2 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0385-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0385-Fix-MC-93764.patch
@ -1,11 +1,11 @@
-From c6dc3e1af9f6a94e1a971f64e528c9e7389389c9 Mon Sep 17 00:00:00 2001
+From 689c5710c054a01ef2b94aa916f0788a448244d8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764


 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 99191f09f..4d692b7e0 100644
+index 99191f09..4d692b7e 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
@@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
@ -18,5 +18,5 @@ index 99191f09f..4d692b7e0 100644
 
     public boolean canRespawn() {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0386-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0386-Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -1,4 +1,4 @@
-From 952fe52570c55108ab6e6412555b292c66572c6e Mon Sep 17 00:00:00 2001
+From b18e2bb9c66322379e66f7658d2b879fd4470b55 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d723868fc..8210b22eb 100644
+index d723868f..8210b22e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -579,4 +579,9 @@ public class PaperWorldConfig {
@ -20,7 +20,7 @@ index d723868fc..8210b22eb 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7e285c629..0ee9e7095 100644
+index 7e285c62..0ee9e709 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -341,6 +341,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -64,5 +64,5 @@ index 7e285c629..0ee9e7095 100644
                                 float f2 = this.player.dc() ? 300.0F : 100.0F;
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0387-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0387-Reset-players-airTicks-on-respawn.patch
@ -1,14 +1,14 @@
-From 0ade622d8c60ba099948cf9ea1342b0a4377ac10 Mon Sep 17 00:00:00 2001
+From a51a1e8f3442825faba94829f3253ca68967ca3a Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2f27af7f6..e448f0893 100644
+index a8271457..28ec879e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2348,7 +2348,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2332,7 +2332,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
     }
 
@ -18,7 +18,7 @@ index 2f27af7f6..e448f0893 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5757e1288..005bcaac1 100644
+index 5757e128..005bcaac 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1627,6 +1627,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -30,5 +30,5 @@ index 5757e1288..005bcaac1 100644
         this.fallDistance = 0;
         this.foodData = new FoodMetaData(this);
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0388-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0388-Strip-private-area-unicode-characters-from-signs.patch
@ -1,4 +1,4 @@
-From d625e370cf321fc96b56d14b0a53b44e41f6a063 Mon Sep 17 00:00:00 2001
+From b93a22d934dc36cee0c69eb86367c1d6826f772c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@ -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 458d1561d..c2bcbbbab 100644
+index 458d1561..c2bcbbba 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
@ -89,5 +89,5 @@ index 458d1561d..c2bcbbbab 100644
 
     public void a(int i, IChatBaseComponent ichatbasecomponent) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0389-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0389-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@ -1,4 +1,4 @@
-From b8f6621d12f44cf503a144ad7da7948059364e10 Mon Sep 17 00:00:00 2001
+From f46b0e7d8d151fd7f1156829d00dbc7d58d204e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup

 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b..23f1447cf 100644
+index 71e48e87..23f1447c 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
@@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644
                     try {
                         Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0390-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0390-Use-more-reasonable-thread-count-default-for-bootstr.patch
@ -1,11 +1,11 @@
-From 943ab46c33ccb6fd337b6f7c797163522c54404f Mon Sep 17 00:00:00 2001
+From 87856a6b665214907ca3a7d4a45bd0e00785703c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap


 diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
-index ee40bccf6..db9af361d 100644
+index ee40bccf..db9af361 100644
 --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
 +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
@@ -21,7 +21,7 @@ public class DataConverterRegistry {
@ -18,5 +18,5 @@ index ee40bccf6..db9af361d 100644
         pool.shutdown();
         return fixer;
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0391-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0391-Use-EntityTypes-for-living-entities.patch
@ -1,11 +1,11 @@
-From 5fd15f8a9f940b58b978dbb8364398b2acfd2059 Mon Sep 17 00:00:00 2001
+From d804016b6f60b86fd06c78582a48032d311722ff Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities


 diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
-index 5a0cc6d05..d385f647e 100644
+index 5a0cc6d0..d385f647 100644
 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
@@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@ -18,7 +18,7 @@ index 5a0cc6d05..d385f647e 100644
             entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
             world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index 75622fbdf..265369984 100644
+index 75622fbd..26536998 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
@@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@ -40,7 +40,7 @@ index 75622fbdf..265369984 100644
                 entityirongolem.setPlayerCreated(true);
                 entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 0f0872c1e..1c1bf85a0 100644
+index 0f0872c1..1c1bf85a 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -94,7 +94,7 @@ public class BlockTurtleEgg extends Block {
@ -53,7 +53,7 @@ index 0f0872c1e..1c1bf85a0 100644
                         entityturtle.setAgeRaw(-24000);
                         entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 93bf32dc1..e6063bb46 100644
+index 93bf32dc..e6063bb4 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
@@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@ -66,7 +66,7 @@ index 93bf32dc1..e6063bb46 100644
 
                 entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index aad7ce93f..09eabf123 100644
+index aad7ce93..09eabf12 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -412,7 +412,7 @@ public class EnderDragonBattle {
@ -79,7 +79,7 @@ index aad7ce93f..09eabf123 100644
         entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.HOLDING_PATTERN);
         entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index ee159e0a8..070a9e7b1 100644
+index ee159e0a..070a9e7b 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@ -92,7 +92,7 @@ index ee159e0a8..070a9e7b1 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5874d2993..cc53e915d 100644
+index 5874d299..cc53e915 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@ -105,7 +105,7 @@ index 5874d2993..cc53e915d 100644
 
     public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 961afa5c4..a372f6508 100644
+index 961afa5c..a372f650 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
@@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@ -118,7 +118,7 @@ index 961afa5c4..a372f6508 100644
                             entityendermite.setPlayerSpawned(true);
                             entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 963b6fbb9..fc20bbe27 100644
+index 963b6fbb..fc20bbe2 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -188,8 +188,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@ -132,7 +132,7 @@ index 963b6fbb9..fc20bbe27 100644
                 entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
                 entityvex.a((EntityInsentient) EntityEvoker.this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 4e8a97c55..1b9425f3e 100644
+index 4e8a97c5..1b9425f3 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -208,11 +208,11 @@ public class EntityHorse extends EntityHorseAbstract {
@ -150,7 +150,7 @@ index 4e8a97c55..1b9425f3e 100644
             int j;
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 72eed22eb..65c40e72b 100644
+index 72eed22e..65c40e72 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
@@ -33,7 +33,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@ -163,7 +163,7 @@ index 72eed22eb..65c40e72b 100644
         this.a(entityageable, (EntityHorseAbstract) object);
         return (EntityAgeable) object;
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index eae2b2665..0a092acdf 100644
+index eae2b266..0a092acd 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@ -176,7 +176,7 @@ index eae2b2665..0a092acdf 100644
 
     public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index c23bc72fc..a1873f557 100644
+index c23bc72f..a1873f55 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -41,7 +41,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@ -189,7 +189,7 @@ index c23bc72fc..a1873f557 100644
 
     public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 5e1976871..82a32c61e 100644
+index 5e197687..82a32c61 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -285,7 +285,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@ -202,7 +202,7 @@ index 5e1976871..82a32c61e 100644
         this.a(entityageable, (EntityHorseAbstract) entityllama);
         EntityLlama entityllama1 = (EntityLlama) entityageable;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index dde9f1e61..638dbe978 100644
+index dde9f1e6..638dbe97 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -40,7 +40,7 @@ public class EntityMushroomCow extends EntityCow {
@ -224,7 +224,7 @@ index dde9f1e61..638dbe978 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index ba074c10c..13c84bda8 100644
+index ba074c10..13c84bda 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -246,7 +246,7 @@ index ba074c10c..13c84bda8 100644
                 entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                 entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 9dc2d8be2..d1689dc33 100644
+index 9dc2d8be..d1689dc3 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -153,7 +153,7 @@ public class EntityPig extends EntityAnimal {
@ -268,7 +268,7 @@ index 9dc2d8be2..d1689dc33 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index a02020d5f..dbb534c9c 100644
+index a02020d5..dbb534c9 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -18,7 +18,7 @@ public class EntityPolarBear extends EntityAnimal {
@ -281,7 +281,7 @@ index a02020d5f..dbb534c9c 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index e545b1c9b..d6bac06a7 100644
+index e545b1c9..d6bac06a 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@ -294,7 +294,7 @@ index e545b1c9b..d6bac06a7 100644
 
         if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index f7a25c148..c35d1eef4 100644
+index f7a25c14..c35d1eef 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -247,7 +247,7 @@ public class EntitySheep extends EntityAnimal {
@ -307,7 +307,7 @@ index f7a25c148..c35d1eef4 100644
         entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
         return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index a42b8d554..9ef1c9baf 100644
+index a42b8d55..9ef1c9ba 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@ -320,7 +320,7 @@ index a42b8d554..9ef1c9baf 100644
             entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
             entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index a533e0eb5..270b95082 100644
+index a533e0eb..270b9508 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@ -333,7 +333,7 @@ index a533e0eb5..270b95082 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index d74bfa120..24ca35119 100644
+index d74bfa12..24ca3511 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@ -345,7 +345,7 @@ index d74bfa120..24ca35119 100644
     public T a(World world) {
         return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f01e776fe..40b3ffd8c 100644
+index f01e776f..40b3ffd8 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -592,7 +592,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -367,7 +367,7 @@ index f01e776fe..40b3ffd8c 100644
             // Paper start
             if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 4f1696d01..46d8e0a1f 100644
+index 4f1696d0..46d8e0a1 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -342,7 +342,7 @@ public class EntityWolf extends EntityTameableAnimal {
@ -380,7 +380,7 @@ index 4f1696d01..46d8e0a1f 100644
 
         if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 7998b80c1..81cc0c3b3 100644
+index 7998b80c..81cc0c3b 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -208,7 +208,7 @@ public class EntityZombie extends EntityMonster {
@ -420,7 +420,7 @@ index 7998b80c1..81cc0c3b3 100644
                     entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                     entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 85d402965..0cca7b6d5 100644
+index 85d40296..0cca7b6d 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@ -433,7 +433,7 @@ index 85d402965..0cca7b6d5 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 86e5fbcda..fb96743af 100644
+index 86e5fbcd..fb96743a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie {
@ -446,7 +446,7 @@ index 86e5fbcda..fb96743af 100644
         entityvillager.u(this);
         entityvillager.setProfession(this.getProfession());
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index 576b3c565..4dd0e39ec 100644
+index 576b3c56..4dd0e39e 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
@@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@ -459,7 +459,7 @@ index 576b3c565..4dd0e39ec 100644
 
                         entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 5ddf66eef..bb7e072ee 100644
+index 5ddf66ee..bb7e072e 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
@@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@ -472,7 +472,7 @@ index 5ddf66eef..bb7e072ee 100644
                                                 entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
                                                 groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index d4fdcbdfd..887e4461f 100644
+index d4fdcbdf..887e4461 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
@@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@ -494,7 +494,7 @@ index d4fdcbdfd..887e4461f 100644
         entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
         entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 0ac1fb53a..509d62f6b 100644
+index 0ac1fb53..509d62f6 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -134,7 +134,7 @@ public class VillageSiege {
@ -507,7 +507,7 @@ index 0ac1fb53a..509d62f6b 100644
             } catch (Exception exception) {
                 exception.printStackTrace();
 diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
-index 94b21693e..0a223cfe5 100644
+index 94b21693..0a223cfe 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
@@ -270,7 +270,7 @@ public class WorldGenEndCityPieces {
@ -520,7 +520,7 @@ index 94b21693e..0a223cfe5 100644
                 entityshulker.setPosition((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
                 entityshulker.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 2def56b06..abeb4aa02 100644
+index 2def56b0..abeb4aa0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
@@ -154,8 +154,7 @@ public class WorldGenFeatureOceanRuinPieces {
@ -534,7 +534,7 @@ index 2def56b06..abeb4aa02 100644
                 entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
                 entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
-index 0e7aed09d..493a86e1b 100644
+index 0e7aed09..493a86e1 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
@@ -1800,7 +1800,7 @@ public class WorldGenMonumentPieces {
@ -556,7 +556,7 @@ index 0e7aed09d..493a86e1b 100644
                 entityguardianelder.heal(entityguardianelder.getMaxHealth());
                 entityguardianelder.setPositionRotation((double) l + 0.5D, (double) i1, (double) j1 + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index 5fa2987d2..967e33b3d 100644
+index 5fa2987d..967e33b3 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
@@ -1640,7 +1640,7 @@ public class WorldGenVillagePieces {
@ -578,7 +578,7 @@ index 5fa2987d2..967e33b3d 100644
                         entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                         entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index efb0379ce..3d8193c47 100644
+index efb0379c..3d8193c4 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
@@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@ -591,7 +591,7 @@ index efb0379ce..3d8193c47 100644
                     entitywitch.di();
                     entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
-index 11010d8e1..4eb746ebb 100644
+index 11010d8e..4eb746eb 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
@@ -23,14 +23,14 @@ public class WorldGenWoodlandMansionPieces {
@ -639,7 +639,7 @@ index 11010d8e1..4eb746ebb 100644
                 entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                 entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 409b50744..a4fc1e5e2 100644
+index 409b5074..a4fc1e5e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -494,7 +494,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -652,7 +652,7 @@ index 409b50744..a4fc1e5e2 100644
                             entityhorseskeleton.s(true);
                             entityhorseskeleton.setAgeRaw(0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e33135ada..6ed7c9355 100644
+index e33135ad..6ed7c935 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1181,153 +1181,153 @@ public class CraftWorld implements World {
@ -868,5 +868,5 @@ index e33135ada..6ed7c9355 100644
 
             if (entity != null) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0392-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0392-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@ -1,4 +1,4 @@
-From 2913846938092fc02e1860c32c140236cd601453 Mon Sep 17 00:00:00 2001
+From 5e5eb3fcdf13fe6484491baa13164746571d89a6 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@ -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 22378b6bc..5e595b62e 100644
+index 22378b6b..5e595b62 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -380,10 +380,11 @@ public class PlayerInteractManager {
@ -30,5 +30,5 @@ index 22378b6bc..5e595b62e 100644
                         iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
                     }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0393-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0393-Optimize-World-Time-Updates.patch
@ -1,4 +1,4 @@
-From 65b31e0965be9753538fa31f155ffae7e7813a34 Mon Sep 17 00:00:00 2001
+From c554c1968e681a6b36e813959a81f9c6c734a5cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 236fbafeb..ce39ea09e 100644
+index 236fbafe..ce39ea09 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1033,12 +1033,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -41,5 +41,5 @@ index 236fbafeb..ce39ea09e 100644
 
         // WorldServer worldserver; // CraftBukkit - dropped down
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0394-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0394-Restore-custom-InventoryHolder-support.patch
@ -1,4 +1,4 @@
-From b69c887ab88baa8af203f67d3b73c6c591134ae1 Mon Sep 17 00:00:00 2001
+From 76b10ad2dce9ec6efcbd94243ffb1fbbdf9adc85 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 23389743d..d25928e09 100644
+index 23389743..d25928e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
@@ -31,10 +31,20 @@ public final class CraftInventoryCreator {
@ -42,5 +42,5 @@ index 23389743d..d25928e09 100644
     }
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0395-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0395-Use-Vanilla-Minecart-Speeds.patch
@ -1,4 +1,4 @@
-From 0e08393d4f1175f2db247dda41f100af1fa5594c Mon Sep 17 00:00:00 2001
+From a130515ba85f62fbb8cc581ea3fd8139da8430c7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@ -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 95b4c0eb1..f83a695a1 100644
+index 95b4c0eb..f83a695a 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -37,9 +37,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@ -23,5 +23,5 @@ index 95b4c0eb1..f83a695a1 100644
     // CraftBukkit end
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0396-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0396-Fix-SpongeAbsortEvent-handling.patch
@ -1,4 +1,4 @@
-From cba8484abc54085762631a00eb1fd7542cd30a61 Mon Sep 17 00:00:00 2001
+From 6c4b270839f7a4b59c48cd84928a85e1a6c15695 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@ -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/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index cbc8e8d13..cda6f2b73 100644
+index cbc8e8d1..cda6f2b7 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
@@ -106,7 +106,11 @@ public class BlockSponge extends Block {
@ -28,7 +28,7 @@ index cbc8e8d13..cda6f2b73 100644
 }
 +
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 08a5acb0a..aa3547690 100644
+index 08a5acb0..aa354769 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
@@ -236,6 +236,7 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
@ -40,5 +40,5 @@ index 08a5acb0a..aa3547690 100644
         this.dropNaturally(world, blockposition, 1.0F, i);
     }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0397-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0397-Don-t-allow-digging-into-unloaded-chunks.patch
@ -1,11 +1,11 @@
-From 9d6140be2028e67d5181b4a6c64e318835b4794b Mon Sep 17 00:00:00 2001
+From 7b25dc439325f8f5273f38afeddd4856c0c8194e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0ee9e7095..1d6f70a72 100644
+index 0ee9e709..1d6f70a7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1223,6 +1223,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -21,5 +21,5 @@ index 0ee9e7095..1d6f70a72 100644
             double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
             double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0398-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0398-Optimize-redstone-algorithm.patch
@ -1,4 +1,4 @@
-From 44e5517e5eee09b6e284e621e8f6081a2c6fab32 Mon Sep 17 00:00:00 2001
+From f42cfde4103ab62abd56d5119612ddd3e2f3291f Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@ -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 8210b22eb..f259c4e51 100644
+index 8210b22e..f259c4e5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -584,4 +584,14 @@ public class PaperWorldConfig {
@ -39,7 +39,7 @@ index 8210b22eb..f259c4e51 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 000000000..21d9d6d7e
+index 00000000..21d9d6d7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
@@ -0,0 +1,910 @@
@ -954,7 +954,7 @@ index 000000000..21d9d6d7e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 48c79568f..a09aa6944 100644
+index 48c79568..a09aa694 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -1,5 +1,7 @@
@ -1122,7 +1122,7 @@ index 48c79568f..a09aa6944 100644
                 iblockdata.a(world, blockposition, 0);
                 world.setAir(blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a21de9b3d..2f12e35ac 100644
+index a21de9b3..2f12e35a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -1142,5 +1142,5 @@ index a21de9b3d..2f12e35ac 100644
         int i = 0;
         EnumDirection[] aenumdirection = World.a;
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0399-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0399-force-entity-dismount-during-teleportation.patch
@ -1,4 +1,4 @@
-From 11ca39a07de98adcd85da982c83abb224aa24dd3 Mon Sep 17 00:00:00 2001
+From 9729bd4721244ce9519ce25bc63af432fee3fe9f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@ -20,10 +20,10 @@ 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 e448f0893..88298680f 100644
+index 28ec879e..5aa26d9e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2110,12 +2110,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2094,12 +2094,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
     }
 
@ -41,7 +41,7 @@ index e448f0893..88298680f 100644
         }
 
     }
-@@ -2160,7 +2163,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2144,7 +2147,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
         return true; // CraftBukkit
     }
 
@ -53,7 +53,7 @@ index e448f0893..88298680f 100644
         if (entity.getVehicle() == this) {
             throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
         } else {
-@@ -2170,7 +2176,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2154,7 +2160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
             if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                 VehicleExitEvent event = new VehicleExitEvent(
                         (Vehicle) getBukkitEntity(),
@ -62,7 +62,7 @@ index e448f0893..88298680f 100644
                 );
                 Bukkit.getPluginManager().callEvent(event);
                 CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2181,7 +2187,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2165,7 +2171,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
             }
             // CraftBukkit end
             // Spigot start
@ -72,7 +72,7 @@ index e448f0893..88298680f 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 82684dd68..dab958a04 100644
+index 82684dd6..dab958a0 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -991,8 +991,11 @@ public abstract class EntityHuman extends EntityLiving {
@ -90,7 +90,7 @@ index 82684dd68..dab958a04 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1023505d1..d134d0fae 100644
+index 1023505d..d134d0fa 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2479,10 +2479,13 @@ public abstract class EntityLiving extends Entity {
@ -110,7 +110,7 @@ index 1023505d1..d134d0fae 100644
             this.A(entity);
         }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 005bcaac1..0ea31156b 100644
+index 005bcaac..0ea31156 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -778,10 +778,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -130,5 +130,5 @@ index 005bcaac1..0ea31156b 100644
 
         if (entity1 != entity && this.playerConnection != null) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0400-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0400-Book-Size-Limits.patch
@ -1,4 +1,4 @@
-From cc0155d6b3d5f89109443b76884e01fe443f8439 Mon Sep 17 00:00:00 2001
+From 0f336ac592dd58b868083c3df5685bcd6c18987d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 52ce8f89e..07f0b4529 100644
+index 52ce8f89..07f0b452 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -449,4 +449,11 @@ public class PaperConfig {
@ -22,7 +22,7 @@ index 52ce8f89e..07f0b4529 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d6f70a72..391ecc9db 100644
+index 1d6f70a7..391ecc9d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -12,6 +12,8 @@ import java.util.Collections;
@ -78,5 +78,5 @@ index 1d6f70a72..391ecc9db 100644
         PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
         if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0401-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0401-Make-the-default-permission-message-configurable.patch
@ -1,11 +1,11 @@
-From 02927d6e0609f850d47293aec167f2e8b6427c99 Mon Sep 17 00:00:00 2001
+From 5feea119a8368e851a297c38131e05c398307d9a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 07f0b4529..a7673dd49 100644
+index 07f0b452..a7673dd4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@ -29,7 +29,7 @@ index 07f0b4529..a7673dd49 100644
     private static void savePlayerData() {
         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59b1628e5..8d26f8d52 100644
+index 59b1628e..8d26f8d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2187,6 +2187,10 @@ public final class CraftServer implements Server {
@ -44,5 +44,5 @@ index 59b1628e5..8d26f8d52 100644
         return createProfile(uuid, null);
     }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0402-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0402-Add-more-Zombie-API.patch
@ -1,11 +1,11 @@
-From 3de52d9785a52885bea32ec3e8c71bb809bbb473 Mon Sep 17 00:00:00 2001
+From 6c6b0e3d43a49dcea567c108ec81ef4de18212e9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API


 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 81cc0c3b3..24bc3e0f0 100644
+index 81cc0c3b..24bc3e0f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -21,8 +21,8 @@ public class EntityZombie extends EntityMonster {
@ -105,7 +105,7 @@ index 81cc0c3b3..24bc3e0f0 100644
 
     public void b(EntityLiving entityliving) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index e93ecb076..c516d3475 100644
+index e93ecb07..c516d347 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
@@ -77,4 +77,34 @@ public class CraftZombie extends CraftMonster implements Zombie {
@ -144,5 +144,5 @@ index e93ecb076..c516d3475 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0403-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0403-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@ -1,4 +1,4 @@
-From 234636ca2d4f795adb5063070ae7ded816b17954 Mon Sep 17 00:00:00 2001
+From 8b6f31ea522b02770ab4dfd2719b3827b605a8cd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
@ -12,7 +12,7 @@ decrease when set, allowing us to skip further checks earlier on
 when looking for an attackable entity

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2f12e35ac..a7f6288f5 100644
+index 2f12e35a..a7f6288f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2729,8 +2729,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -31,5 +31,5 @@ index 2f12e35ac..a7f6288f5 100644
 
                 if (entityhuman1.isSneaking()) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0404-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0404-Prevent-rayTrace-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From a441d9367e48dd010ae069c27c94a8b9a11fc3d0 Mon Sep 17 00:00:00 2001
+From 70985e124c4778d3199a21d56f0c98bb5ab307c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a7f6288f5..380ef602e 100644
+index a7f6288f..380ef602 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -31,5 +31,5 @@ index a7f6288f5..380ef602e 100644
 
                     if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0405-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0405-Handle-Large-Packets-disconnecting-client.patch
@ -1,4 +1,4 @@
-From ecae87da966db6e21ba5895a1cf9cc83afa47975 Mon Sep 17 00:00:00 2001
+From 0323e6a88a6d0a0d92693e8cf00c635e536ac512 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@ -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 c53697914..0b8796d0a 100644
+index c5369791..0b8796d0 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -27,7 +27,7 @@ index c53697914..0b8796d0a 100644
             NetworkManager.g.debug("Skipping packet due to errors", throwable.getCause());
         } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa..2d8e6a2f4 100644
+index 601d4d0f..2d8e6a2f 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
@@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@ -44,7 +44,7 @@ index 601d4d0fa..2d8e6a2f4 100644
         return false;
     }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 2aa805eef..4f7bc186a 100644
+index 2aa805ee..4f7bc186 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
@@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@ -80,7 +80,7 @@ index 2aa805eef..4f7bc186a 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 8e35d14f9..4a57e8a3e 100644
+index 8e35d14f..4a57e8a3 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
@@ -76,7 +76,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@ -93,7 +93,7 @@ index 8e35d14f9..4a57e8a3e 100644
         } else {
             this.d = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index 706d84385..c0d8f8b42 100644
+index 706d8438..c0d8f8b4 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
@@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
@ -113,5 +113,5 @@ index 706d84385..c0d8f8b42 100644
 
     public PacketPlayOutWindowItems(int i, NonNullList<ItemStack> nonnulllist) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0406-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0406-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@ -1,4 +1,4 @@
-From 0a1a29f95e71af8ff4d2236defc3d6a7291cae6c Mon Sep 17 00:00:00 2001
+From 86a46ae01d4ae97262d5678047e236ab948cb106 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 698cfb918..fbdb2df27 100644
+index 698cfb91..fbdb2df2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -27,12 +27,12 @@ import org.bukkit.plugin.Plugin;
@ -61,5 +61,5 @@ index 698cfb918..fbdb2df27 100644
 
     public long getFirstPlayed() {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0407-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0407-Add-PlayerConnectionCloseEvent.patch
@ -1,4 +1,4 @@
-From d384327fb1f3ecbad9e027ec821eb18a2f89d928 Mon Sep 17 00:00:00 2001
+From 8f211cdb5fcaae0d42f7464b0ff0a642337aab21 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.

 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index ca76f2a38..dfe7a029f 100644
+index ca76f2a3..dfe7a029 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -50,7 +50,7 @@ index ca76f2a38..dfe7a029f 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 0b8796d0a..553637239 100644
+index 0b8796d0..55363723 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -16,6 +16,7 @@ import io.netty.handler.timeout.TimeoutException;
@ -89,5 +89,5 @@ index 0b8796d0a..553637239 100644
 
         }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0408-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0408-Prevent-Enderman-from-loading-chunks.patch
@ -1,11 +1,11 @@
-From 983d7d5ef87b165edfa81c3faaa848a56e60424c Mon Sep 17 00:00:00 2001
+From ce7e4637f27da1e8842baef63d3743f80ef9b1a1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks


 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index e4aba0e0a..945040442 100644
+index e4aba0e0..94504044 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -297,7 +297,8 @@ public class EntityEnderman extends EntityMonster {
@ -29,5 +29,5 @@ index e4aba0e0a..945040442 100644
             IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0409-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0409-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@ -1,4 +1,4 @@
-From 4d6b8594f7965849fdea5333195b8ee0225be869 Mon Sep 17 00:00:00 2001
+From 9f3265e5ab66c6f819666f59e6c29e313f2d0497 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0ea31156b..de17da992 100644
+index 0ea31156..de17da99 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -28,7 +28,7 @@ index 0ea31156b..de17da992 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 ec760325b..135d25abd 100644
+index ec760325..135d25ab 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -95,6 +95,7 @@ public abstract class PlayerList {
@ -40,7 +40,7 @@ index ec760325b..135d25abd 100644
         UserCache usercache = this.server.getUserCache();
         GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index fbdb2df27..e1973c5d6 100644
+index fbdb2df2..e1973c5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -245,6 +245,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@ -106,7 +106,7 @@ index fbdb2df27..e1973c5d6 100644
         NBTTagCompound data = getData();
         if (data == null) return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a2eae5d10..36a387137 100644
+index a2eae5d1..36a38713 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -163,5 +163,5 @@ index a2eae5d10..36a387137 100644
 
     @Override
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0410-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0410-Fix-PlayerEditBookEvent.patch
@ -1,4 +1,4 @@
-From b5421b0be23fc686596e60936435d80f504e70fb Mon Sep 17 00:00:00 2001
+From f55270f77166a5a22352bfe2364c8c2bc156ad8d Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@ -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 391ecc9db..04344a371 100644
+index 391ecc9d..04344a37 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -823,10 +823,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -31,5 +31,5 @@ index 391ecc9db..04344a371 100644
 
                 }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0411-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0411-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@ -1,11 +1,11 @@
-From a0045c8cf1a254b336a6780975f3956f4eb89dd6 Mon Sep 17 00:00:00 2001
+From 300e021f95d237beddc589d1fe7aa83d1e958535 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index de17da992..010749ddc 100644
+index de17da99..010749dd 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1113,6 +1113,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -23,5 +23,5 @@ index de17da992..010749ddc 100644
             this.a(true, false, false);
         }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0412-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0412-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@ -1,4 +1,4 @@
-From e69034d72f50f98e0e7816d8579856fb07d463f7 Mon Sep 17 00:00:00 2001
+From 8c6ffec131b77b19ec381452242db50ad460cd70 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
@ -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 dbe0ff33a..0109484e0 100644
+index dbe0ff33..0109484e 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -118,7 +118,7 @@ public class BlockPiston extends BlockDirectional {
@ -46,5 +46,5 @@ index dbe0ff33a..0109484e0 100644
             // CraftBukkit end
             world.playBlockAction(blockposition, this, b0, enumdirection.a());
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0413-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0413-Block-Entity-remove-from-being-called-on-Players.patch
@ -1,4 +1,4 @@
-From 9ca0e55ef61f8e8a91da1955969e98e3f4ca50b7 Mon Sep 17 00:00:00 2001
+From 466b0863b8230009ca37f7d3a0d02e8b1dc71566 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 36a387137..fbe342902 100644
+index 36a38713..fbe34290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1937,6 +1937,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -32,5 +32,5 @@ index 36a387137..fbe342902 100644
 
     // Spigot start
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0414-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0414-Allow-Saving-of-Oversized-Chunks.patch
@ -1,4 +1,4 @@
-From 467b292a8b46213f6b39aaa5a84679a5962aa08a Mon Sep 17 00:00:00 2001
+From 2c4cb0c82dc28e856e188a2c3e93fb070a485fda Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.

 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 12268f87b..e1f7e06ab 100644
+index 12268f87..e1f7e06a 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
@@ -39,6 +39,7 @@ public class NBTCompressedStreamTools {
@ -51,7 +51,7 @@ index 12268f87b..e1f7e06ab 100644
         a((NBTBase) nbttagcompound, dataoutput);
     }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index c20511588..d148ce497 100644
+index c2051158..d148ce49 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -78,6 +78,7 @@ public class RegionFile {
@ -256,7 +256,7 @@ index c20511588..d148ce497 100644
     }
 }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 8c8b7cbab..a17e76d83 100644
+index 8c8b7cba..a17e76d8 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -16,6 +16,7 @@ public class RegionFileCache {
@ -427,5 +427,5 @@ index 8c8b7cbab..a17e76d83 100644
             laste = null; break; // Paper
             } catch (Exception exception) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0415-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0415-BlockDestroyEvent.patch
@ -1,4 +1,4 @@
-From eaca6ecc58e1da8df00006a3a831914106e336ad Mon Sep 17 00:00:00 2001
+From f2edbe0285f08b5623efbae8bc50d5b52522edd7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 380ef602e..4d3f88431 100644
+index 380ef602..4d3f8843 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -37,5 +37,5 @@ index 380ef602e..4d3f88431 100644
                 iblockdata.a(this, blockposition, 0);
             }
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0416-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0416-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@ -1,4 +1,4 @@
-From 6b02bc4b62cb8b03cfc0f7ce3b296ff926a172e9 Mon Sep 17 00:00:00 2001
+From 7cfd3117c43b0ff0f82aa7b0947a9b75ce47b07b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped

 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index 819b4ac2d..ea4083a45 100644
+index 819b4ac2..ea4083a4 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
@@ -62,18 +62,47 @@ public class ShapelessRecipes implements IRecipe {
@ -66,5 +66,5 @@ index 819b4ac2d..ea4083a45 100644
     }
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0417-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0417-Fix-sign-edit-memory-leak.patch
@ -1,4 +1,4 @@
-From 8b662c496a50ccf0dcc0f1349a01330fb72afb80 Mon Sep 17 00:00:00 2001
+From 4d4298e12cc6f2f1e7e58ac64b26e6ec723503a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@ -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 04344a371..5c58b8538 100644
+index 04344a37..5c58b853 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2527,7 +2527,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -19,7 +19,7 @@ index 04344a371..5c58b8538 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 c2bcbbbab..fdb771317 100644
+index c2bcbbba..fdb77131 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -14,6 +14,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
@ -43,5 +43,5 @@ index c2bcbbbab..fdb771317 100644
 
     public EntityHuman e() {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0418-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0418-Limit-Client-Sign-length-more.patch
@ -1,4 +1,4 @@
-From a957c57908f15824af6f30b22a2cf02a3df9161c Mon Sep 17 00:00:00 2001
+From d10abc45cb7482b5377a1e0f378215977efc8209 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@ -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 5c58b8538..dc8c20efb 100644
+index 5c58b853..dc8c20ef 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -104,6 +104,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -50,5 +50,5 @@ index 5c58b8538..dc8c20efb 100644
             }
             SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0419-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0419-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@ -1,4 +1,4 @@
-From ed7f18ee7ffb1f8e946945efa6d20c7cae84f7ac Mon Sep 17 00:00:00 2001
+From 1f818762158d6badca6d6cd055d1efa8ffc0e876 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
@ -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 fdb771317..d0a91f675 100644
+index fdb77131..d0a91f67 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -15,6 +15,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
@ -28,5 +28,5 @@ index fdb771317..d0a91f675 100644
         }
         // CraftBukkit end
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0420-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0420-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@ -1,4 +1,4 @@
-From 91d8d13e7f7fbc50b731814627308bae64596762 Mon Sep 17 00:00:00 2001
+From 62791340e3b5e08d359390dc92047e6667728c45 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
@ -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 553637239..30f646e42 100644
+index 55363723..30f646e4 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -221,6 +221,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -31,7 +31,7 @@ index 553637239..30f646e42 100644
 
     // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4..8d0965a05 100644
+index 2d8e6a2f..8d0965a0 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
@@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
@ -43,7 +43,7 @@ index 2d8e6a2f4..8d0965a05 100644
         return false;
     }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 4a57e8a3e..eb54bdb64 100644
+index 4a57e8a3..eb54bdb6 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
@@ -23,6 +23,13 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@ -85,5 +85,5 @@ index 4a57e8a3e..eb54bdb64 100644
                 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper
 
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0421-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0421-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@ -1,4 +1,4 @@
-From 7a0c2e427c2daae71e744e6f9206b3d4845aaedb Mon Sep 17 00:00:00 2001
+From aaab09b32f6984e9b5a28f9ce2f46f86fcca86d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
@ -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 b7cde4d41..949039f89 100644
+index b7cde4d4..949039f8 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@ -23,7 +23,7 @@ index b7cde4d41..949039f89 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 135d25abd..408c382d2 100644
+index 135d25ab..408c382d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -63,7 +63,7 @@ public abstract class PlayerList {
@ -62,5 +62,5 @@ index 135d25abd..408c382d2 100644
 
     public List<EntityPlayer> b(String s) {
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0422-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0422-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@ -1,4 +1,4 @@
-From 5f9210aa3404004e2486669cca9bbd90e8e941fe Mon Sep 17 00:00:00 2001
+From 8dd3f66179bdef2f4bf29b6dfba38a71207ea8bc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887

 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 24bc3e0f0..bf2bed002 100644
+index 24bc3e0f..bf2bed00 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -175,6 +175,7 @@ public class EntityZombie extends EntityMonster {
@ -18,5 +18,5 @@ index 24bc3e0f0..bf2bed002 100644
                 } else {
                     this.bI = -1;
 -- 
-2.21.0
+2.20.1

--- a/Spigot-Server-Patches/0423-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0423-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@ -1,4 +1,4 @@
-From f299fb452e762d8c151e19ac018f541861085903 Mon Sep 17 00:00:00 2001
+From 9182ec0d1784fc22fe61c3f1498378c4421f0621 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
@ -17,5 +17,5 @@ index 408c382d..b1630137 100644
     }
 
 -- 
-2.21.0
+2.20.1