diff --git a/Spigot-Server-Patches/0345-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0345-Don-t-double-add-golems-to-world.patch
deleted file mode 100644
index edbff6fc1a..0000000000
--- a/Spigot-Server-Patches/0345-Don-t-double-add-golems-to-world.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f2b1092f6e41ddc56e63ffd5a87d4169e8e8d6a6 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 30 Aug 2018 20:56:26 -0400
-Subject: [PATCH] Don't double add golems to world
-
-spawnCreature adds to world now
-
-diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index c63f70b1f..057a3b475 100644
---- a/src/main/java/net/minecraft/server/Village.java
-+++ b/src/main/java/net/minecraft/server/Village.java
-@@ -83,7 +83,7 @@ public class Village {
-
- if (entityirongolem != null) {
- if (entityirongolem.a((GeneratorAccess) this.a, false) && entityirongolem.a((IWorldReader) this.a)) {
-- this.a.addEntity(entityirongolem, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_DEFENSE); // CraftBukkit
-+ //this.a.addEntity(entityirongolem); // Paper - already is in the world
- return entityirongolem;
- }
-
---
-2.20.1
-
diff --git a/Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0345-fix-newlines-in-spigot-tab-list-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch
rename to Spigot-Server-Patches/0345-fix-newlines-in-spigot-tab-list-API.patch
index c8241d83ee..25f9fabb3e 100644
--- a/Spigot-Server-Patches/0346-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0345-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From ea8c24ad4a4e79738faa19e59cbe7c21ac10b4ef Mon Sep 17 00:00:00 2001
+From a55e136708d93f39018512f640777efb9653c7a9 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 1 Sep 2018 11:29:52 +0100
Subject: [PATCH] fix newlines in spigot tab list API
@@ -7,7 +7,7 @@ Spigots implementation around the header/footer strips newlines from the
header/footer, this patch allows the tab list header/footer to retain newlines.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 261bc223e1..b9dbc78848 100644
+index ce58cfc11e..143779dfc2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -368,20 +368,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0347-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0346-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 90%
rename from Spigot-Server-Patches/0347-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0346-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 9c44d3f1a8..a2a312f1fd 100644
--- a/Spigot-Server-Patches/0347-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0346-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From d8ccca4685a527834fef3718c4b2af370352b209 Mon Sep 17 00:00:00 2001
+From d4cb5e252af407394fdad5ea6656aace256590ef Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:34:33 -0700
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2c4465fff..95fe3a91b 100644
+index 2c4465fff1..95fe3a91bf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -296,7 +296,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0348-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0347-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0348-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0347-Add-ray-tracing-methods-to-LivingEntity.patch
index 9b9cc1067b..0a8fb82e4c 100644
--- a/Spigot-Server-Patches/0348-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0347-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From 91de71ca2959255f3475be5c3d804e51504115cc Mon Sep 17 00:00:00 2001
+From f7376054077e494e444604793b6a528f8dec967b Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 3 Sep 2018 18:20:03 -0500
Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8f5ff37c2..b4dcdda0c 100644
+index 8f5ff37c2c..b4dcdda0cc 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2816,6 +2816,22 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 8f5ff37c2..b4dcdda0c 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 52834b6da..eeab59379 100644
+index 52834b6da3..eeab59379a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -171,6 +171,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0348-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0348-Expose-attack-cooldown-methods-for-Player.patch
index 5cdee6edd9..944b9d4b50 100644
--- a/Spigot-Server-Patches/0349-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0348-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 6f24254031e4e750ab23011d3f06ed6f391dac1f Mon Sep 17 00:00:00 2001
+From e4b01dcd11cd942924a16a9693730e2645972219 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Tue, 4 Sep 2018 15:02:00 -0500
Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cdf5eb62e7..74110f90f8 100644
+index 59f108e490..82684dd688 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2057,14 +2057,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index cdf5eb62e7..74110f90f8 100644
this.aH = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b9dbc78848..0503d7cf47 100644
+index 143779dfc2..07b9545e76 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1892,6 +1892,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0350-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch b/Spigot-Server-Patches/0349-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
similarity index 98%
rename from Spigot-Server-Patches/0350-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
rename to Spigot-Server-Patches/0349-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
index ba9bf8f41a..4ec6c61910 100644
--- a/Spigot-Server-Patches/0350-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
+++ b/Spigot-Server-Patches/0349-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
@@ -1,4 +1,4 @@
-From df43f5561ed43c61c0631fd2b3fd38677ff38936 Mon Sep 17 00:00:00 2001
+From 0d6646f34d25a48e7a0fac4653c71c724e715af1 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
diff --git a/Spigot-Server-Patches/0351-Improve-death-events.patch b/Spigot-Server-Patches/0350-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0351-Improve-death-events.patch
rename to Spigot-Server-Patches/0350-Improve-death-events.patch
index d43ea6a700..b2202f18c3 100644
--- a/Spigot-Server-Patches/0351-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0350-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From a5f10a2a464cd37f4f98d428ea9bb5ad5752c091 Mon Sep 17 00:00:00 2001
+From b3f8e2954c26b3ea5e5518131483169b70b7e225 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
diff --git a/Spigot-Server-Patches/0352-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0351-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 92%
rename from Spigot-Server-Patches/0352-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0351-Allow-chests-to-be-placed-with-NBT-data.patch
index f9a84fe69c..a15b8ca2f0 100644
--- a/Spigot-Server-Patches/0352-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0351-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From 2901bf52c0b6d48d3c27cff678e9876d7f4317af Mon Sep 17 00:00:00 2001
+From 740fee3513cfc3fde95fc3143285c7d873987c03 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 99dab7a47..5a67e1f92 100644
+index 914da48a23..7827f692af 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 99dab7a47..5a67e1f92 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 c46b761cc5..2e0f782f65 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
diff --git a/Spigot-Server-Patches/0353-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0352-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0353-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0352-Mob-Pathfinding-API.patch
index a4f857c8c6..137b91aebc 100644
--- a/Spigot-Server-Patches/0353-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0352-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 99faaeeba75ccedfefc7614fe07f3f13f9d5d3b4 Mon Sep 17 00:00:00 2001
+From 5ac90bbc0feb33ca051212567a9d978ef739a198 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 0000000000..ed3d86ddd3
--- /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 c55aadb536..cac0ce2a3a 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 31fc1fbc65..5cf7f3bf1b 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 78ed002868..0dd6e46d12 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 5bf1cd06fa..53c2d154ed 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;
diff --git a/Spigot-Server-Patches/0354-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0353-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0354-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0353-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 1edf4ce600..67962b22f1 100644
--- a/Spigot-Server-Patches/0354-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0353-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From 00da8bde7bf84be611564fc3a4fc92b580fb2778 Mon Sep 17 00:00:00 2001
+From 5a71847deef02674f0c90f28e19de4bbe3d1be27 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 28edf37d0d..bbffeae3d0 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 {
diff --git a/Spigot-Server-Patches/0355-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0354-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0355-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0354-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index e677cd1829..3eefe10dbf 100644
--- a/Spigot-Server-Patches/0355-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0354-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From 3d7a3196483b58cc78e94b6ee53f867335269418 Mon Sep 17 00:00:00 2001
+From 112f74898582feab4c96557300cc97ce9de5389e 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/Spigot-Server-Patches/0356-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0355-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0356-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0355-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 055b20c229..7ab67273a3 100644
--- a/Spigot-Server-Patches/0356-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0355-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From b67b3c781d590a9931408f69e3f44af7ee4d1f7a Mon Sep 17 00:00:00 2001
+From 062b314e9738b03ea846cd097167d93bd4680d60 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 2b15aa6c9e..3ca32123bb 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 e58fdee8bb..f2c4048c2b 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 cd56ca04e..f48d5d9f7 100644
+index cd56ca04ea..f48d5d9f78 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -757,7 +757,17 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0357-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0356-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0357-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0356-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 0549edd25c..593a61084d 100644
--- a/Spigot-Server-Patches/0357-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0356-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 16d624d217abbe74fa423441710d56e31ef68d3c Mon Sep 17 00:00:00 2001
+From 899e7615e1933e6a98fca25a1c4f2f7cedfc02ef 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 bfbe4d3e39..e2bf17f442 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 {
diff --git a/Spigot-Server-Patches/0358-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0357-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0358-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0357-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 4fb3bc466b..8d30a0c1b5 100644
--- a/Spigot-Server-Patches/0358-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0357-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From b6c5dee1dbede3adfd04ab74e75c2c994cc191f6 Mon Sep 17 00:00:00 2001
+From 5e7acdf5c2c844f2936159bdb6554de05cad98b6 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 c399bdecc3..3496d4236d 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 {
diff --git a/Spigot-Server-Patches/0359-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0358-Optimize-and-Fix-ExpiringMap-Issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0359-Optimize-and-Fix-ExpiringMap-Issues.patch
rename to Spigot-Server-Patches/0358-Optimize-and-Fix-ExpiringMap-Issues.patch
index d8068dd35b..78a7127e4b 100644
--- a/Spigot-Server-Patches/0359-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0358-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From 3b4942bc3e766dae5126d7dede1e187b42437635 Mon Sep 17 00:00:00 2001
+From fd7247a45305a527faaeb92f0ac887d5bffcddab 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 a237684410..835a2aae40 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 bd36364796..bf6095137a 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 41c9dccab3..6138c14eae 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 4cca65666d..9c917370ae 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
diff --git a/Spigot-Server-Patches/0360-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0360-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch
index 15efd6fad7..915823a0ef 100644
--- a/Spigot-Server-Patches/0360-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 8781bbdc79c9c4878c5adaabae97f792f22c3be6 Mon Sep 17 00:00:00 2001
+From 8bba4c242ab99b8b0cae9d42487a320af1caac67 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 5b6ccfa9f5..bfbd35bbe5 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 6ca6a6bf2..cb456f726 100644
+index 6ca6a6bf24..cb456f7269 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
@@ -74,4 +74,18 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F
diff --git a/Spigot-Server-Patches/0361-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0360-Support-Overriding-World-Seeds.patch
similarity index 96%
rename from Spigot-Server-Patches/0361-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0360-Support-Overriding-World-Seeds.patch
index 4916e4f480..a12581591d 100644
--- a/Spigot-Server-Patches/0361-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0360-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 5ebb95ffe2aad80290de28e4e87de3ef56c018a3 Mon Sep 17 00:00:00 2001
+From f648f409ece71b0b16103bb43fb647591dcfb7b6 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 f3f2a0b69..6f76351b8 100644
+index 6bd59a886d..359c538f32 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 f3f2a0b69..6f76351b8 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7b24f6e24..11510640a 100644
+index 6138c14eae..5393a11db0 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 7b24f6e24..11510640a 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 4e971d244..65eed2a90 100644
+index 8458dc17d4..b5fb95293e 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 4e971d244..65eed2a90 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 392cd0e3d..62903f374 100644
+index 5372e9d540..18bc27ee66 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -987,7 +987,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0362-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0361-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0362-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0361-Optimize-Server-World-Map.patch
index 8b14ae096c..c89109b5d4 100644
--- a/Spigot-Server-Patches/0362-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0361-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 291b93b50bc17be89a1b494314c2bde27839f1b4 Mon Sep 17 00:00:00 2001
+From e46279653b3711a6e6a537daaab08da2d6d4eef6 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 0000000000..af9e4455c6
--- /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 5393a11db0..68743a6b77 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
diff --git a/Spigot-Server-Patches/0363-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0362-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0363-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0362-PreSpawnerSpawnEvent.patch
index f5a3620387..a4db731057 100644
--- a/Spigot-Server-Patches/0363-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0362-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 28e88db787de6d4c63a2c6c0528d1d14566589fc Mon Sep 17 00:00:00 2001
+From b7c96de459d89e977071a0e5ec36d590aa60185c 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 eca3f85ad2..b2d2de7f81 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 {
diff --git a/Spigot-Server-Patches/0364-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0363-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 99%
rename from Spigot-Server-Patches/0364-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0363-Catch-JsonParseException-in-Entity-and-TE-names.patch
index ea673ff561..877f4bd3e0 100644
--- a/Spigot-Server-Patches/0364-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0363-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From b24f25ca79e8d769b321b513c83b4c7c2fabe1f2 Mon Sep 17 00:00:00 2001
+From fd5c70a2d7cea45e159e5d1b9ae576b5dff62a7e 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
diff --git a/Spigot-Server-Patches/0365-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0364-Avoid-dimension-id-collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0365-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0364-Avoid-dimension-id-collisions.patch
index 7fb1439818..05078dd7e7 100644
--- a/Spigot-Server-Patches/0365-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0364-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 542d9be7dd04e9abd5672608d56d23b2544be89a Mon Sep 17 00:00:00 2001
+From 66ebfa5f368dcb5c0fc6c7861bd1fa4133d5a27e 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 62903f374..a0f255ff1 100644
+index 18bc27ee66..4dabd31d96 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -973,7 +973,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0366-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0365-Honor-EntityAgeable.ageLock.patch
similarity index 86%
rename from Spigot-Server-Patches/0366-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0365-Honor-EntityAgeable.ageLock.patch
index 2d769f5bdb..5d86034995 100644
--- a/Spigot-Server-Patches/0366-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0365-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From 10cc618952c7e71420ef2a91f1ed0bd46073d304 Mon Sep 17 00:00:00 2001
+From d03995270a2ea0676fbf224d1959984c7fa89ea4 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 2af1ac7028..aa54e380e4 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 {
diff --git a/Spigot-Server-Patches/0367-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch
similarity index 99%
rename from Spigot-Server-Patches/0367-Async-Chunk-Loading-and-Generation.patch
rename to Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch
index 497bf50776..2d8b7c5030 100644
--- a/Spigot-Server-Patches/0367-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From 72819ee8a242b895f5f56c7c737445c450c14aa1 Mon Sep 17 00:00:00 2001
+From 31e7140454df9477e1b83041498f33dde76e2650 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 6f76351b8..e8b03795f 100644
+index 359c538f32..942520088e 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 6f76351b8..e8b03795f 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 000000000..8f18c2869
+index 0000000000..8f18c28695
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
@@ -0,0 +1,347 @@
@@ -458,7 +458,7 @@ index 000000000..8f18c2869
+
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 71d865b76..6d3f5b651 100644
+index 71d865b76a..6d3f5b6512 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 71d865b76..6d3f5b651 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 2021c0d02..154ab09e0 100644
+index 2021c0d02e..154ab09e0c 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 2021c0d02..154ab09e0 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 186cfda7e..9cdeb3bfc 100644
+index 186cfda7e4..9cdeb3bfc2 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 {
@@ -712,7 +712,7 @@ index 186cfda7e..9cdeb3bfc 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d938eb374..51df075b4 100644
+index d938eb3749..51df075b44 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 {
@@ -739,7 +739,7 @@ index d938eb374..51df075b4 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 2af07ae59..9c6844d44 100644
+index 2af07ae592..9c6844d441 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 {
@@ -761,7 +761,7 @@ index 2af07ae59..9c6844d44 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 d3898599f..8f061f5ca 100644
+index d3898599f8..8f061f5ca3 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
@@ -832,7 +832,7 @@ index d3898599f..8f061f5ca 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 454903a0e..dcbcb655c 100644
+index 454903a0e7..dcbcb655c5 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;
@@ -920,7 +920,7 @@ index 454903a0e..dcbcb655c 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 f5a6387f2..f45685099 100644
+index f5a6387f27..f456850997 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;
@@ -933,7 +933,7 @@ index f5a6387f2..f45685099 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 cb8125c13..5807ef8a2 100644
+index a4c5b0b5b5..b572e535ac 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
@@ -946,7 +946,7 @@ index cb8125c13..5807ef8a2 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 4698ee99f..dfb45cc4e 100644
+index 4698ee99f8..dfb45cc4ea 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;
@@ -959,7 +959,7 @@ index 4698ee99f..dfb45cc4e 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 8bb2593aa..67bb28954 100644
+index 8bb2593aa9..67bb289545 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;
@@ -980,7 +980,7 @@ index 8bb2593aa..67bb28954 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 68743a6b7..1dbb03a9a 100644
+index 68743a6b77..1dbb03a9a0 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
@@ -1070,7 +1070,7 @@ index 68743a6b7..1dbb03a9a 100644
if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
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 000000000..e9a38f9d9
+index 0000000000..e9a38f9d90
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
@@ -0,0 +1,655 @@
@@ -1730,7 +1730,7 @@ index 000000000..e9a38f9d9
+
+}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 240f59066..e4cf8548d 100644
+index 240f590666..e4cf8548d3 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 {
@@ -1828,7 +1828,7 @@ index 240f59066..e4cf8548d 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 679488a3c..b7dda8e28 100644
+index 679488a3cf..b7dda8e282 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 {
@@ -1888,7 +1888,7 @@ index 679488a3c..b7dda8e28 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 de6dd4fed..da6df06d8 100644
+index de6dd4fed7..da6df06d84 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 {
@@ -1901,7 +1901,7 @@ index de6dd4fed..da6df06d8 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 8e909d9ca..f214a74a2 100644
+index 8e909d9caf..f214a74a29 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> {
@@ -1956,7 +1956,7 @@ index 8e909d9ca..f214a74a2 100644
}
}
diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index d9def7135..945a005e9 100644
+index d9def71353..945a005e90 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 {
@@ -1991,7 +1991,7 @@ index d9def7135..945a005e9 100644
}
diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index 284e96710..8b08efe1f 100644
+index 284e96710a..8b08efe1f4 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;
@@ -2052,7 +2052,7 @@ index 284e96710..8b08efe1f 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f48d5d9f7..b5b0fcf8c 100644
+index f48d5d9f78..b5b0fcf8cd 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;
@@ -2149,7 +2149,7 @@ index f48d5d9f7..b5b0fcf8c 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 69d8a25bd..d0eaa9e9f 100644
+index 69d8a25bdf..d0eaa9e9f8 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;
@@ -2302,7 +2302,7 @@ index 69d8a25bd..d0eaa9e9f 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a9fffa544..19ce77c4a 100644
+index a9fffa544f..19ce77c4a3 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -715,7 +715,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -2315,7 +2315,7 @@ index a9fffa544..19ce77c4a 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4dabd31d9..007cc6438 100644
+index 4dabd31d96..007cc64387 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1019,8 +1019,12 @@ public final class CraftServer implements Server {
@@ -2343,7 +2343,7 @@ index 4dabd31d9..007cc6438 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 95fe3a91b..b5a87cfaf 100644
+index 95fe3a91bf..b5a87cfaf6 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 {
@@ -2381,7 +2381,7 @@ index 95fe3a91b..b5a87cfaf 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 58ebecefe..282b4e6c3 100644
+index 58ebecefe0..282b4e6c38 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -81,6 +81,7 @@ public class CraftEventFactory {
@@ -2443,7 +2443,7 @@ index 58ebecefe..282b4e6c3 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 9c917370a..a299092a5 100644
+index 9c917370ae..a299092a58 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
diff --git a/Spigot-Server-Patches/0368-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0367-Ignore-Dimension-NBT-field-in-Entity-data.patch
similarity index 95%
rename from Spigot-Server-Patches/0368-Ignore-Dimension-NBT-field-in-Entity-data.patch
rename to Spigot-Server-Patches/0367-Ignore-Dimension-NBT-field-in-Entity-data.patch
index d2318824e7..c5ae094eb4 100644
--- a/Spigot-Server-Patches/0368-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0367-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From 734f143e67284eec0c47f931c238cd6c1572b8cb Mon Sep 17 00:00:00 2001
+From 2189dac4ba9b3e11215c35546733756f9a635818 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
diff --git a/Spigot-Server-Patches/0369-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0368-Optimize-Light-Recalculations.patch
similarity index 95%
rename from Spigot-Server-Patches/0369-Optimize-Light-Recalculations.patch
rename to Spigot-Server-Patches/0368-Optimize-Light-Recalculations.patch
index 15531b55f5..d57ec558ab 100644
--- a/Spigot-Server-Patches/0369-Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/0368-Optimize-Light-Recalculations.patch
@@ -1,4 +1,4 @@
-From 76e1fac06834b1d779a12d879a9d90cc0b6aa760 Mon Sep 17 00:00:00 2001
+From 695bfadd880ff0a6efb5791f61223a5c2cbc4ccb 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/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6d3f5b651..9ac594dcb 100644
+index 6d3f5b6512..9ac594dcbe 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 {
@@ -36,7 +36,7 @@ index 6d3f5b651..9ac594dcb 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 b5b0fcf8c..88f8145c4 100644
+index b5b0fcf8cd..88f8145c4d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -584,8 +584,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index c61fbf8a9c..67383c784a 100644
--- a/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 2c9e9fcb11acd9f81fe8ecfd877f4c8f27bbac8d Mon Sep 17 00:00:00 2001
+From e154874d67835605e5e359706de7dd788da052df 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 88f8145c4..55cd98ae2 100644
+index 88f8145c4d..55cd98ae20 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1074,7 +1074,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0371-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0370-Don-t-recheck-type-after-setting-a-block.patch
similarity index 92%
rename from Spigot-Server-Patches/0371-Don-t-recheck-type-after-setting-a-block.patch
rename to Spigot-Server-Patches/0370-Don-t-recheck-type-after-setting-a-block.patch
index 280b22a8b5..2cc62cc23f 100644
--- a/Spigot-Server-Patches/0371-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0370-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From abab5932b172b4e8e62afbcf9f072831e95b91d3 Mon Sep 17 00:00:00 2001
+From 00cf97b8886cef4dec433b623e49396b58cd9ce3 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 9ac594dcb..d9eb3e51b 100644
+index 9ac594dcbe..d9eb3e51be 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 {
diff --git a/Spigot-Server-Patches/0372-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0371-Fix-Sending-Chunks-to-Client.patch
similarity index 94%
rename from Spigot-Server-Patches/0372-Fix-Sending-Chunks-to-Client.patch
rename to Spigot-Server-Patches/0371-Fix-Sending-Chunks-to-Client.patch
index d1228b10ab..ab0b5549aa 100644
--- a/Spigot-Server-Patches/0372-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0371-Fix-Sending-Chunks-to-Client.patch
@@ -1,4 +1,4 @@
-From 7548eb21700bc84bb467885a29a09bb159ee8320 Mon Sep 17 00:00:00 2001
+From b50cd605c8fcdb6b00a8adb40b8e3db7b39562c2 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 d9eb3e51b..e73149d4d 100644
+index d9eb3e51be..e73149d4d1 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1199,7 +1199,7 @@ public class Chunk implements IChunkAccess {
@@ -41,7 +41,7 @@ index d9eb3e51b..e73149d4d 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 e4cf8548d3..ac5d158093 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 {
diff --git a/Spigot-Server-Patches/0373-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0372-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0373-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0372-Configurable-connection-throttle-kick-message.patch
index 822c1662f3..00797335ca 100644
--- a/Spigot-Server-Patches/0373-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0372-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From 0a896ee1a0004c0575a55887b8f51665e78692e9 Mon Sep 17 00:00:00 2001
+From 8d712d670119838b7892b314d5bede06b4f2f36e 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 e8b03795f..5663a6517 100644
+index 942520088e..7f9845d926 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 e8b03795f..5663a6517 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 e732d55f9f..2c594b4378 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 {
diff --git a/Spigot-Server-Patches/0374-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0373-Fix-FileIOThread-concurrency-issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0374-Fix-FileIOThread-concurrency-issues.patch
rename to Spigot-Server-Patches/0373-Fix-FileIOThread-concurrency-issues.patch
index b5b02f20a9..47c7dd09ff 100644
--- a/Spigot-Server-Patches/0374-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0373-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From d5f43cbf4f3216b3bdc8f527937ed13f4ce5bbe6 Mon Sep 17 00:00:00 2001
+From 0e7e7d56ed8a092ac1cdc0eb91b5527c9f6aff27 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 3c688f546c..570624600d 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 {
diff --git a/Spigot-Server-Patches/0375-Don-t-update-snapshot-blockstates.patch b/Spigot-Server-Patches/0374-Don-t-update-snapshot-blockstates.patch
similarity index 90%
rename from Spigot-Server-Patches/0375-Don-t-update-snapshot-blockstates.patch
rename to Spigot-Server-Patches/0374-Don-t-update-snapshot-blockstates.patch
index 484e0efd81..189ca79774 100644
--- a/Spigot-Server-Patches/0375-Don-t-update-snapshot-blockstates.patch
+++ b/Spigot-Server-Patches/0374-Don-t-update-snapshot-blockstates.patch
@@ -1,11 +1,11 @@
-From 4d84e269a9519668890005f18c0bdbdf0b170adc Mon Sep 17 00:00:00 2001
+From 29383c04b5ff50986479c3217d4bebbed40aec29 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mnmiller1@me.com>
Date: Fri, 5 Oct 2018 15:46:46 +1000
Subject: [PATCH] Don't update snapshot blockstates
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 082a1b6e2..2b78fff9f 100644
+index 082a1b6e20..2b78fff9f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -131,7 +131,11 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
diff --git a/Spigot-Server-Patches/0376-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0376-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch
index de350eb24a..4905daeaad 100644
--- a/Spigot-Server-Patches/0376-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From fabdc3242791cbc82af3de15008cd8c9c99e70d4 Mon Sep 17 00:00:00 2001
+From 7ca3999002551b397d6ae130a28be6ec90f218bb 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 875b4f77c..93e09e42f 100644
+index 875b4f77c3..93e09e42fa 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;
diff --git a/Spigot-Server-Patches/0377-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0376-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0377-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0376-Allow-setting-the-vex-s-summoner.patch
index cbb5f377b6..78d5e3b25a 100644
--- a/Spigot-Server-Patches/0377-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0376-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 1043f7c0b41618b160b04f1cb66a82fa8fc82168 Mon Sep 17 00:00:00 2001
+From ebf7172071942ea275ccd10ee833d99f8eb39676 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 c3864b869e..589b13f4ee 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 927ed9a9a..c23b1e960 100644
+index 927ed9a9a8..c23b1e9601 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 {
diff --git a/Spigot-Server-Patches/0378-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0377-Add-LivingEntity-getTargetEntity.patch
similarity index 99%
rename from Spigot-Server-Patches/0378-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0377-Add-LivingEntity-getTargetEntity.patch
index a02de6697b..0acec14abc 100644
--- a/Spigot-Server-Patches/0378-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0377-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 65cde9b271841fc052d367034a96e2e6c7d1a003 Mon Sep 17 00:00:00 2001
+From a4d33b7947cfca78f42e45ea096adcf82b4c4e23 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/Spigot-Server-Patches/0379-Add-sun-related-API.patch b/Spigot-Server-Patches/0378-Add-sun-related-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0379-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0378-Add-sun-related-API.patch
index f51ac3b639..9cbf3c4bdd 100644
--- a/Spigot-Server-Patches/0379-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0378-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From b7ede6e38c6a03c3c9a2c2fb64b9ebfdea31b7d8 Mon Sep 17 00:00:00 2001
+From bd1e23a74e539c1a5ea3e37efe5a85a2aefe206b 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 8317ecea8..2aa49aaee 100644
+index ee5078370c..3059682a49 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 8317ecea8..2aa49aaee 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 55cd98ae2..a186637f5 100644
+index 55cd98ae20..a186637f5e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -822,6 +822,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -29,7 +29,7 @@ index 55cd98ae2..a186637f5 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 b5a87cfaf6..e33135adaa 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 53c2d154ed..40a429942e 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 {
diff --git a/Spigot-Server-Patches/0380-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0379-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0380-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0379-Check-Drowned-for-Villager-Aggression-Config.patch
index 73e28b9a30..1b42c3b3e8 100644
--- a/Spigot-Server-Patches/0380-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0379-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From a3bf6b21afb09af5d0da5b206897c8a05d65d1fa Mon Sep 17 00:00:00 2001
+From c55b5010e5dddf597b10af1f3ff6f917d4bf3e3c 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 b861c623cc..0e2b5ee743 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 {
diff --git a/Spigot-Server-Patches/0381-Here-s-Johnny.patch b/Spigot-Server-Patches/0380-Here-s-Johnny.patch
similarity index 91%
rename from Spigot-Server-Patches/0381-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0380-Here-s-Johnny.patch
index 60b7fefd18..387e89903e 100644
--- a/Spigot-Server-Patches/0381-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0380-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 20a985b804a500425a97750c6922f7bc7d78a141 Mon Sep 17 00:00:00 2001
+From 35825baa82a8299fad1d27c71fec87d7b7ad8d4c 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 96d0651e9b..4bbb4817b1 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 951d479298..5ff957ced7 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 {
diff --git a/Spigot-Server-Patches/0382-Turtle-API.patch b/Spigot-Server-Patches/0381-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0382-Turtle-API.patch
rename to Spigot-Server-Patches/0381-Turtle-API.patch
index 285fe5e6de..dddc791336 100644
--- a/Spigot-Server-Patches/0382-Turtle-API.patch
+++ b/Spigot-Server-Patches/0381-Turtle-API.patch
@@ -1,11 +1,11 @@
-From 9f23307fb6ef86d5e7cf675ab1bf4a01af64f619 Mon Sep 17 00:00:00 2001
+From 90d7f580dd37ba586f779e7c9d303b31323ec063 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 b016e0ae7c..a533e0eb5b 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 123a2c75ca..8edcf7af65 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 @@
diff --git a/Spigot-Server-Patches/0383-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0382-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0383-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0382-Limit-lightning-strike-effect-distance.patch
index 52b42634f6..ee6fcac1d9 100644
--- a/Spigot-Server-Patches/0383-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0382-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From 8c24d844718c866d1bb5029c3699d8713f36c9c3 Mon Sep 17 00:00:00 2001
+From 7222856c42e6fbd8dcff0e0781d963ee1c8e0f34 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 d8897e59f..575281991 100644
+index d8897e59fd..575281991c 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 d8897e59f..575281991 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 7781babf51..50f6200095 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 19ce77c4a..8e23d060d 100644
+index 19ce77c4a3..8e23d060d0 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1065,7 +1065,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -82,5 +82,5 @@ index 19ce77c4a..8e23d060d 100644
} else {
return false;
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0384-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0383-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 94%
rename from Spigot-Server-Patches/0384-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0383-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index d0af42d5f4..f144a9e5ae 100644
--- a/Spigot-Server-Patches/0384-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0383-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 386b6cc86e089cfdfc2bbf70781c5c23253d8005 Mon Sep 17 00:00:00 2001
+From 271664e32a34f47286f8257e2c2e120d36b46e64 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 d11e4d3d8..dc0f38ddf 100644
+index d11e4d3d86..dc0f38ddf9 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -410,20 +410,22 @@ public class EntityItem extends Entity {
@@ -37,7 +37,7 @@ index d11e4d3d8..dc0f38ddf 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 6036592f76..4128ba4c06 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0385-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0384-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 93%
rename from Spigot-Server-Patches/0385-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0384-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 89c63c797a..911e062f71 100644
--- a/Spigot-Server-Patches/0385-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0384-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 0244182ccc7ad034077f148f983110b5b21f65ef Mon Sep 17 00:00:00 2001
+From 2d1f359999cfd61731eabbdb81e857f0706a46ef 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 62b5b6ecea..60ab1c7514 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0386-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0386-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch
index 973103937c..44959d942a 100644
--- a/Spigot-Server-Patches/0386-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0385-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From dc5af06257e0c557abfdb7d774a13b0e6ef9c3b9 Mon Sep 17 00:00:00 2001
+From ec231941fc1da58e5b33fbe633825a813cab58a6 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 00c2072d7..bd768e170 100644
+index 00c2072d70..bd768e170c 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 00c2072d7..bd768e170 100644
protected void E() {
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0387-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0386-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0387-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0386-Add-Velocity-IP-Forwarding-Support.patch
index e61e61f328..a1510d93a8 100644
--- a/Spigot-Server-Patches/0387-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0386-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From b980e21362028ef6fafe9d3625d80d3bb2ec9f1a Mon Sep 17 00:00:00 2001
+From 2bae06dc050935e5b7145e39eda4220b850b901b 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 7f9845d926..52ce8f89e5 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 0000000000..fdd8708f97
--- /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 c5801122dd..ca76f2a380 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 4c1110479c..c536979140 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 b95836d443..621aad1503 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 bdac03da43..430445cc6d 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 345843a7f2..23c96f44b3 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0388-Add-more-Witch-API.patch b/Spigot-Server-Patches/0387-Add-more-Witch-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0388-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0387-Add-more-Witch-API.patch
index c4c887f123..11881a75d0 100644
--- a/Spigot-Server-Patches/0388-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0387-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From c839cb3a0a06dcbb7ab8554e5cf60649c534100f Mon Sep 17 00:00:00 2001
+From 0e18567bbaac7e3b7bee3434dd287060bf827153 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 feedfc9d9c..955e0e19b9 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 f25998eb6d..ac465bda2e 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0389-Fix-MC-93764.patch b/Spigot-Server-Patches/0388-Fix-MC-93764.patch
similarity index 84%
rename from Spigot-Server-Patches/0389-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0388-Fix-MC-93764.patch
index 06d78860aa..5b6e55bacb 100644
--- a/Spigot-Server-Patches/0389-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0388-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From 87f36b5bf6229e9f028b2b3f874f368fd68202a8 Mon Sep 17 00:00:00 2001
+From 12903acd93062bd5c9b94e74d53a4c5c23035b10 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 99191f09f0..4d692b7e05 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0390-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0389-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0390-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0389-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 45381ff4d0..f2989d46f1 100644
--- a/Spigot-Server-Patches/0390-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0389-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From 7930d7bd5878635f80f342c5600c45878d7893f0 Mon Sep 17 00:00:00 2001
+From f6e01d6360441f498d56175e148300b20c5f786f 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 575281991..f47a648af 100644
+index 575281991c..f47a648af3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -574,4 +574,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 575281991..f47a648af 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0bcb9c1ab..c1f47701c 100644
+index 0bcb9c1ab1..c1f47701cc 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 0bcb9c1ab..c1f47701c 100644
float f2 = this.player.dc() ? 300.0F : 100.0F;
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0391-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch
similarity index 88%
rename from Spigot-Server-Patches/0391-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch
index 072c5573ce..753e1f1f8f 100644
--- a/Spigot-Server-Patches/0391-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0390-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From 692430048fa0efc50b1079db791a2a416c5fa10c Mon Sep 17 00:00:00 2001
+From f2250ee165b70c7c46044dbe16fd3e1c63835c5f 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 2f27af7f6e..e448f08930 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
@@ -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 bd768e170..71c4ed8fa 100644
+index bd768e170c..71c4ed8fa6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1620,6 +1620,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -30,5 +30,5 @@ index bd768e170..71c4ed8fa 100644
this.fallDistance = 0;
this.foodData = new FoodMetaData(this);
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0392-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0391-Strip-private-area-unicode-characters-from-signs.patch
similarity index 97%
rename from Spigot-Server-Patches/0392-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0391-Strip-private-area-unicode-characters-from-signs.patch
index bf0c5966f0..d5f529eb80 100644
--- a/Spigot-Server-Patches/0392-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0391-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 6f20d9f7b5e9104a0551dcc48d547b106514dcc7 Mon Sep 17 00:00:00 2001
+From cca5d501331cc26b1cc60d69eb4ba2b5a3963d63 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 458d1561d0..c2bcbbbab9 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0393-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 93%
rename from Spigot-Server-Patches/0393-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 984edc76b6..d29092eca7 100644
--- a/Spigot-Server-Patches/0393-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 7cc50b23768cde36a244fc3c18a089ffd8a1dbdb Mon Sep 17 00:00:00 2001
+From 0ddf48a449d2c390bc4e5a8bdac9cd162a771214 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,30 +7,30 @@ 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 26a743722c..6ed3199c3d 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 {
- }
-
- final int page = 0;
+ }
+
+ final int page = 0;
+ boolean hasRequested = false; // Paper
-
- for (final List<String> request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) {
- int failCount = 0;
+
+ for (final List<String> request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) {
+ int failCount = 0;
@@ -67,6 +68,12 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
- LOGGER.debug("Couldn't find profile {}", name);
- callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile"));
- }
+ LOGGER.debug("Couldn't find profile {}", name);
+ callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile"));
+ }
+ // Paper start
+ if (!hasRequested) {
+ hasRequested = true;
+ continue;
+ }
+ // Paper end
-
- try {
- Thread.sleep(DELAY_BETWEEN_PAGES);
+
+ try {
+ Thread.sleep(DELAY_BETWEEN_PAGES);
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0394-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0393-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 90%
rename from Spigot-Server-Patches/0394-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0393-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 11c3f48d94..582d7d7f82 100644
--- a/Spigot-Server-Patches/0394-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0393-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From 4e0a7885c7da60f4553d7f8d81702e4f1b9248fd Mon Sep 17 00:00:00 2001
+From e7e7be9caf3f4b51a3053cce17d929f9e4235b16 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 ee40bccf63..db9af361d6 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0395-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch
similarity index 97%
rename from Spigot-Server-Patches/0395-Use-EntityTypes-for-living-entities.patch
rename to Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch
index ea043ffeb1..96b8bee4b3 100644
--- a/Spigot-Server-Patches/0395-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0394-Use-EntityTypes-for-living-entities.patch
@@ -1,11 +1,11 @@
-From 5e1fa3233998b14424f465003f1040e595785184 Mon Sep 17 00:00:00 2001
+From 1e922622fd78c8c72f5976328018d4763b3c1be4 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 5a0cc6d058..d385f647e7 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 75622fbdf8..2653699840 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 d2cc6bbe2..b180772ae 100644
+index d2cc6bbe25..b180772ae8 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block {
@@ -53,7 +53,7 @@ index d2cc6bbe2..b180772ae 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 93bf32dc1a..e6063bb462 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 aad7ce93f6..09eabf1235 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 ee159e0a81..070a9e7b14 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 5874d2993c..cc53e915d7 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 961afa5c42..a372f6508f 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 963b6fbb9c..fc20bbe272 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 4e8a97c557..1b9425f3e6 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 72eed22eb9..65c40e72bf 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 eae2b26655..0a092acdfe 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 c23bc72fc8..a1873f557c 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 5e19768710..82a32c61ed 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 dde9f1e61e..638dbe978d 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 ba074c10c6..13c84bda84 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 9dc2d8be27..d1689dc33a 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 a02020d5fc..dbb534c9cd 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 e545b1c9b3..d6bac06a7a 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 f7a25c1483..c35d1eef43 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 a42b8d554f..9ef1c9baf2 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 a533e0eb5b..270b950820 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 d74bfa1201..24ca351194 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 f01e776fe5..40b3ffd8ca 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 4f1696d018..46d8e0a1f4 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 7998b80c17..81cc0c3b33 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 85d402965b..0cca7b6d51 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 86e5fbcdab..fb96743af2 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 576b3c5650..4dd0e39ec3 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 5ddf66eef5..bb7e072ee1 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 d4fdcbdfd6..887e4461f3 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 0ac1fb53a4..509d62f6b6 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 94b21693e2..0a223cfe5a 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 2def56b067..abeb4aa025 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 0e7aed09d1..493a86e1bf 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 5fa2987d2a..967e33b3d7 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 efb0379ce3..3d8193c477 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 11010d8e12..4eb746ebb0 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 8e23d060d..6671d7180 100644
+index 8e23d060d0..6671d71802 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 8e23d060d..6671d7180 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 e33135adaa..6ed7c93550 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0396-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 94%
rename from Spigot-Server-Patches/0396-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index dc601f1e23..42032fab71 100644
--- a/Spigot-Server-Patches/0396-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From e607873dd0bfd306dbc848e7ec040bbcd33bfcee Mon Sep 17 00:00:00 2001
+From 17f7952a20a3acc5a90ae35e6d65abe9fe8e992c 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 22574a184..74dcbc74f 100644
+index 22574a184f..74dcbc74ff 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -384,10 +384,11 @@ public class PlayerInteractManager {
@@ -30,5 +30,5 @@ index 22574a184..74dcbc74f 100644
iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
}
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0397-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0396-Optimize-World-Time-Updates.patch
similarity index 95%
rename from Spigot-Server-Patches/0397-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0396-Optimize-World-Time-Updates.patch
index ebd547bf2b..16c58f732c 100644
--- a/Spigot-Server-Patches/0397-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0396-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 95b4e432788d2388e96c6d0d77b6a11c63c8392a Mon Sep 17 00:00:00 2001
+From 5bbabe146bc2b65fcc2abc22861b7c75e30ce2c0 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 1dbb03a9a..4e648ee73 100644
+index 1dbb03a9a0..4e648ee735 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 1dbb03a9a..4e648ee73 100644
// WorldServer worldserver; // CraftBukkit - dropped down
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0398-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0397-Restore-custom-InventoryHolder-support.patch
similarity index 94%
rename from Spigot-Server-Patches/0398-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0397-Restore-custom-InventoryHolder-support.patch
index 897041ebed..7e11bf6b21 100644
--- a/Spigot-Server-Patches/0398-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0397-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 2e9cde9a0ca3e1d0be107e1b234b0bd28fa63820 Mon Sep 17 00:00:00 2001
+From 2e6ee11e2dd1eba9daab627edaae558cf375956d 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 23389743d5..d25928e094 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0399-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0398-Use-Vanilla-Minecart-Speeds.patch
similarity index 90%
rename from Spigot-Server-Patches/0399-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0398-Use-Vanilla-Minecart-Speeds.patch
index f45ca0b8d0..e0abb303d3 100644
--- a/Spigot-Server-Patches/0399-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0398-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From e09424c5c195e7c29b27daaaf649a00c24f7162a Mon Sep 17 00:00:00 2001
+From de7bc131c980b3a3971cfc2fb04268f95ae24a7a 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 a8a64d054..41e8a4b50 100644
+index a8a64d054c..41e8a4b507 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 a8a64d054..41e8a4b50 100644
// CraftBukkit end
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0400-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0399-Fix-SpongeAbsortEvent-handling.patch
similarity index 92%
rename from Spigot-Server-Patches/0400-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0399-Fix-SpongeAbsortEvent-handling.patch
index c0172c552a..9b6fdb163a 100644
--- a/Spigot-Server-Patches/0400-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0399-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 4006a9e53a0b6437105e6e56b6afa1d1e678452c Mon Sep 17 00:00:00 2001
+From c8b481c1cbefd8df47f43036630d918772939dc7 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 cbc8e8d139..cda6f2b732 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 08a5acb0ac..aa3547690a 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0401-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0400-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 90%
rename from Spigot-Server-Patches/0401-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0400-Don-t-allow-digging-into-unloaded-chunks.patch
index 14ca25bac0..d7aef1fe9f 100644
--- a/Spigot-Server-Patches/0401-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0400-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,11 +1,11 @@
-From 53a515250b753d7f8af244eff4f1597edcd25221 Mon Sep 17 00:00:00 2001
+From a3abb8955d68007d99c6fef60c26c708a91a6485 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 c1f47701c..cb6d1deb8 100644
+index c1f47701cc..cb6d1deb88 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1222,6 +1222,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -21,5 +21,5 @@ index c1f47701c..cb6d1deb8 100644
double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0402-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0401-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0402-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0401-Optimize-redstone-algorithm.patch
index 9975c234c0..c517db69d7 100644
--- a/Spigot-Server-Patches/0402-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0401-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 9b6caf78c5b7fa16e573dca1ab0cbd1ab4adcb23 Mon Sep 17 00:00:00 2001
+From 448a78b9923ab4bed3002a13d2ecbeedfa42de4a 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 f47a648af..eefbb355d 100644
+index f47a648af3..eefbb355dc 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -579,4 +579,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index f47a648af..eefbb355d 100644
}
diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
new file mode 100644
-index 000000000..21d9d6d7e
+index 0000000000..21d9d6d7ed
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
@@ -0,0 +1,910 @@
@@ -954,7 +954,7 @@ index 000000000..21d9d6d7e
+ }
+}
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 48c79568f..a09aa6944 100644
+index 48c79568fb..a09aa69444 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 a186637f5..589d3efa7 100644
+index a186637f5e..589d3efa70 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -641,6 +641,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -1142,5 +1142,5 @@ index a186637f5..589d3efa7 100644
int i = 0;
EnumDirection[] aenumdirection = World.a;
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0403-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0402-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from Spigot-Server-Patches/0403-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0402-force-entity-dismount-during-teleportation.patch
index 7e0e31e3e5..d9ee4a1893 100644
--- a/Spigot-Server-Patches/0403-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0402-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 9403e28b74eb83372d343ce7b48564188d9cb26f Mon Sep 17 00:00:00 2001
+From 7634b4bcd399116e5fad8e042d210b54b0084ed3 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,7 +20,7 @@ this is going to be the best soultion all around.
Improvements/suggestions welcome!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e448f0893..88298680f 100644
+index e448f08930..88298680fb 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
@@ -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 82684dd688..dab958a042 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 710ad8b17..4acbc17ae 100644
+index 710ad8b176..4acbc17aed 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2478,10 +2478,13 @@ public abstract class EntityLiving extends Entity {
@@ -110,7 +110,7 @@ index 710ad8b17..4acbc17ae 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 71c4ed8fa..1c90f2f85 100644
+index 71c4ed8fa6..1c90f2f85a 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 71c4ed8fa..1c90f2f85 100644
if (entity1 != entity && this.playerConnection != null) {
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0404-Book-Size-Limits.patch b/Spigot-Server-Patches/0403-Book-Size-Limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0404-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0403-Book-Size-Limits.patch
index 4b3c93c2a1..cdd4f0d359 100644
--- a/Spigot-Server-Patches/0404-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0403-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 7623137520234c8714abf84ebf41ad121fc05703 Mon Sep 17 00:00:00 2001
+From 92e515581ac52b59c5c38945a382d061756c6f16 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 52ce8f89e5..07f0b45295 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 cb6d1deb8..8d06b23ea 100644
+index cb6d1deb88..8d06b23eaf 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 cb6d1deb8..8d06b23ea 100644
PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0405-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0404-Make-the-default-permission-message-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0405-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0404-Make-the-default-permission-message-configurable.patch
index ca2d8c5b04..4e167e3111 100644
--- a/Spigot-Server-Patches/0405-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0404-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 1ff5f985f5dd9a7ea98fbfc6aad4e578d12a9a1e Mon Sep 17 00:00:00 2001
+From 17e3b11bf71f9b7a8c491d7d048cde92b25b6324 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 07f0b45295..a7673dd49d 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 007cc6438..92c429dde 100644
+index 007cc64387..92c429dded 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2147,6 +2147,10 @@ public final class CraftServer implements Server {
@@ -44,5 +44,5 @@ index 007cc6438..92c429dde 100644
return createProfile(uuid, null);
}
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0406-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0405-Add-more-Zombie-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0406-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0405-Add-more-Zombie-API.patch
index d1ca8ff8ad..5a9b2727d8 100644
--- a/Spigot-Server-Patches/0406-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0405-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 13c1f4753dddbf0e6e46677d09b310f9b093203f Mon Sep 17 00:00:00 2001
+From b45a2758308482ba290664aabc22d75c76463826 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 81cc0c3b33..24bc3e0f08 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 e93ecb076b..c516d34759 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0407-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0406-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
similarity index 93%
rename from Spigot-Server-Patches/0407-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
rename to Spigot-Server-Patches/0406-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
index d370c959c1..e1b154fc5d 100644
--- a/Spigot-Server-Patches/0407-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0406-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@@ -1,4 +1,4 @@
-From 417c56224750636541260725b50ed6e37751ecc0 Mon Sep 17 00:00:00 2001
+From 89559f21278d3266548781c5d637afde29f2e122 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 589d3efa7..c5960cf4c 100644
+index 589d3efa70..c5960cf4cb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2722,8 +2722,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -31,5 +31,5 @@ index 589d3efa7..c5960cf4c 100644
if (entityhuman1.isSneaking()) {
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0408-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0407-Prevent-rayTrace-from-loading-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0408-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0407-Prevent-rayTrace-from-loading-chunks.patch
index eb7126ff24..615ddc615d 100644
--- a/Spigot-Server-Patches/0408-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0407-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 52c7cca32fd1cec519b9b300049ac347f4ab27b2 Mon Sep 17 00:00:00 2001
+From 6f62ca5139a969a7a92e62fed7fe83b4805115bb 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 c5960cf4c..e11e22836 100644
+index c5960cf4cb..e11e22836f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -853,7 +853,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -31,5 +31,5 @@ index c5960cf4c..e11e22836 100644
if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0409-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0408-Handle-Large-Packets-disconnecting-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0409-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0408-Handle-Large-Packets-disconnecting-client.patch
index aeb0bcfc24..abd13c5c72 100644
--- a/Spigot-Server-Patches/0409-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0408-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 37f0fba5cfd2e991e81d17622aff9a868143d588 Mon Sep 17 00:00:00 2001
+From 6765831d65aae314abbf094443dd288bc186c030 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 c536979140..0b8796d0ae 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 601d4d0fa2..2d8e6a2f4a 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 2aa805eef1..4f7bc186aa 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 8e35d14f97..4a57e8a3ec 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 706d843859..c0d8f8b428 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0410-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0409-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0410-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0409-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index c61f4bbe70..0f495e39c9 100644
--- a/Spigot-Server-Patches/0410-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0409-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 4cc4515d691743ac31e780e395aa7a5ad01b7bdc Mon Sep 17 00:00:00 2001
+From ca392b8044ca9a2fb975734fd34720f5510cc320 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 698cfb918b..fbdb2df27d 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0411-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0410-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0411-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0410-Add-PlayerConnectionCloseEvent.patch
index 1feb71b778..20cdfc6e2b 100644
--- a/Spigot-Server-Patches/0411-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0410-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 022b84a2165e2f606e0a5957052ca7bbb89a577a Mon Sep 17 00:00:00 2001
+From 9455b937b60f78aebec39fbaaa4d8bef03833ed2 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 ca76f2a380..dfe7a029f8 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 0b8796d0ae..553637239c 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0412-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0411-Prevent-Enderman-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0412-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0411-Prevent-Enderman-from-loading-chunks.patch
index fb8853c070..5923747ddb 100644
--- a/Spigot-Server-Patches/0412-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0411-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From 39afde38725cbe76eb0c828b06220f802e0dcc07 Mon Sep 17 00:00:00 2001
+From b9473a7a4eb705ca27b7bd74f199acf1a7be504f 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 e4aba0e0a8..9450404428 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0413-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0412-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0413-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0412-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 3db561d5f2..4ee58e4f5c 100644
--- a/Spigot-Server-Patches/0413-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0412-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From bdb90b71eec7ce6794a5b3a89861691486fea505 Mon Sep 17 00:00:00 2001
+From 8e19d3e0cfde60d13993fa5ea2f70208c345014d 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 1c90f2f85..32557caf2 100644
+index 1c90f2f85a..32557caf2b 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 1c90f2f85..32557caf2 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 ec760325ba..135d25abd2 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 fbdb2df27d..e1973c5d67 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 a2eae5d10c..36a3871371 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.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0414-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0413-Fix-PlayerEditBookEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0414-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0413-Fix-PlayerEditBookEvent.patch
index ee93342431..d6017c678e 100644
--- a/Spigot-Server-Patches/0414-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0413-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From 3be7b85aa061b33408a7766503e24e7721f44be1 Mon Sep 17 00:00:00 2001
+From 8606eff98f1c567f87cebfbbfccd8019d0ff09bf 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 8d06b23ea..a8a6e236e 100644
+index 8d06b23eaf..a8a6e236ea 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -822,10 +822,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -31,5 +31,5 @@ index 8d06b23ea..a8a6e236e 100644
}
--
-2.16.1.windows.1
+2.20.1
diff --git a/Spigot-Server-Patches/0415-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 88%
rename from Spigot-Server-Patches/0415-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index ad76d635b2..0a503e1de9 100644
--- a/Spigot-Server-Patches/0415-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From 0e14a48302de67fb42ba8db81c391e223be86f54 Mon Sep 17 00:00:00 2001
+From 5733ba4d35501fc7d7127b2fa332cf0aa03dd88b 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 32557caf2..596478120 100644
+index 32557caf2b..5964781208 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1106,6 +1106,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 32557caf2..596478120 100644
this.a(true, false, false);
}
--
-2.16.1.windows.1
+2.20.1