diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch
index 8f6f045f6..9d19d8bd3 100644
--- a/Spigot-API-Patches/0006-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch
@@ -1,11 +1,11 @@
-From 046a9cacf026fd179eba24607ba5401c03b45b42 Mon Sep 17 00:00:00 2001
+From 73ffeed771aad1a3dd6af47de0875a4b20900ef7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cffa0c65f..2ad9a7d7f 100644
+index cffa0c65..2ad9a7d7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1341,6 +1341,17 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index cffa0c65f..2ad9a7d7f 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9f7f760af..3ad70b92f 100644
+index 9f7f760a..3ad70b92 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1122,6 +1122,16 @@ public interface Server extends PluginMessageRecipient {
@@ -48,5 +48,5 @@ index 9f7f760af..3ad70b92f 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
new file mode 100644
index 000000000..476827db1
--- /dev/null
+++ b/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
@@ -0,0 +1,40 @@
+From 362462f10a7eddad6dd8e8e1066156dc1d155c5e Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Tue, 4 Sep 2018 15:01:54 -0500
+Subject: [PATCH] Expose attack cooldown methods for Player
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index a840b49d..1b3a6a91 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -1922,6 +1922,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @param profile The new profile to use
+      */
+     void setPlayerProfile(@NotNull PlayerProfile profile);
++
++    /**
++     * Returns the amount of ticks the current cooldown lasts
++     *
++     * @return Amount of ticks cooldown will last
++     */
++    float getCooldownPeriod();
++
++    /**
++     * Returns the percentage of attack power available based on the cooldown (zero to one).
++     *
++     * @param adjustTicks Amount of ticks to add to cooldown counter for this calculation
++     * @return Percentage of attack power available
++     */
++    float getCooledAttackStrength(float adjustTicks);
++
++    /**
++     * Reset the cooldown counter to 0, effectively starting the cooldown period.
++     */
++    void resetCooldown();
+     // Paper end
+ 
+     // Spigot start
+-- 
+2.17.1
+
diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 98%
rename from Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 6d10a867c..f72a682bb 100644
--- a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -1,4 +1,4 @@
-From 177fd27d66c07d01d4826bfb5cc9dd992e21b887 Mon Sep 17 00:00:00 2001
+From df2942a347fb3b97c649f9340bda21f0c8d697b4 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
@@ -6,7 +6,7 @@ Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
 
 diff --git a/src/main/java/com/destroystokyo/paper/Namespaced.java b/src/main/java/com/destroystokyo/paper/Namespaced.java
 new file mode 100644
-index 000000000..cd1a34b82
+index 00000000..cd1a34b8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Namespaced.java
 @@ -0,0 +1,40 @@
@@ -52,7 +52,7 @@ index 000000000..cd1a34b82
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/src/main/java/com/destroystokyo/paper/NamespacedTag.java
 new file mode 100644
-index 000000000..28f3fda95
+index 00000000..28f3fda9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/NamespacedTag.java
 @@ -0,0 +1,142 @@
@@ -199,7 +199,7 @@ index 000000000..28f3fda95
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index f5e3929aa..8648e8fb6 100644
+index f5e3929a..8648e8fb 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
@@ -226,7 +226,7 @@ index f5e3929aa..8648e8fb6 100644
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f2a6755a5..3ed7ea06a 100644
+index f2a6755a..3ed7ea06 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -86,14 +86,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
@@ -343,5 +343,5 @@ index f2a6755a5..3ed7ea06a 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 97%
rename from Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
rename to Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
index 71bcf680f..ddc047af5 100644
--- a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
@@ -1,4 +1,4 @@
-From 875d7e1da48a97e3d239c85b153b5db4f8bc4296 Mon Sep 17 00:00:00 2001
+From 9ef8200b5f3b3e797872a12054a45dc32f11b0d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions
@@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map
 lookups in half.
 
 diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-index 27c14c0f5..72fff64e0 100644
+index 27c14c0f..72fff64e 100644
 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
 +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
 @@ -70,8 +70,11 @@ public class PermissibleBase implements Permissible {
@@ -111,5 +111,5 @@ index 27c14c0f5..72fff64e0 100644
      }
  
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 95%
rename from Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
rename to Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch
index 24f493d2f..7caad0411 100644
--- a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch
@@ -1,4 +1,4 @@
-From b7cbdf7b28497f69afaf63fdae60c903231d2855 Mon Sep 17 00:00:00 2001
+From 196d1c1b282ba815fc8b3112a52ad60f1eeafbcb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
@@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 new file mode 100644
-index 000000000..43e6576b1
+index 00000000..43e6576b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
 @@ -0,0 +1,51 @@
@@ -65,5 +65,5 @@ index 000000000..43e6576b1
 +    }
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 92%
rename from Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch
index a7006f92d..0b6620848 100644
--- a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 8b72b61b5b8b87c1c2bf8c1099edc27f893db680 Mon Sep 17 00:00:00 2001
+From 39f9822f65fbe38486e69b1d5a574688e19f66cd Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +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/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
-index db3d22fa9..97b25dbd9 100644
+index db3d22fa..97b25dbd 100644
 --- a/src/main/java/org/bukkit/block/Furnace.java
 +++ b/src/main/java/org/bukkit/block/Furnace.java
 @@ -62,6 +62,26 @@ public interface Furnace extends Container, Nameable {
@@ -37,5 +37,5 @@ index db3d22fa9..97b25dbd9 100644
      @Override
      public FurnaceInventory getInventory();
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
rename to Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch
index 8a82e91fb..0ae16f423 100644
--- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
+++ b/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 9d711bd307bd1b1f02458a5af2f5513f396e630c Mon Sep 17 00:00:00 2001
+From 930e3600cd6fdda939c4c6a0906af9d294b20f0f Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:50:10 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -10,7 +10,7 @@ spawners.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 new file mode 100644
-index 000000000..48cff0635
+index 00000000..48cff063
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
 @@ -0,0 +1,29 @@
@@ -44,5 +44,5 @@ index 000000000..48cff0635
 +    }
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch
similarity index 91%
rename from Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
rename to Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch
index 6aa587e09..b8853c614 100644
--- a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -1,4 +1,4 @@
-From e6fe9e0337266d2cfcae640d7ee44f840f4305bc Mon Sep 17 00:00:00 2001
+From 01ac7113f549a412bd05f296f27d8f5ccb0264df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier
 Vanilla allows empty names
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index a97631474..f0dff145a 100644
+index a9763147..f0dff145 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable {
@@ -23,5 +23,5 @@ index a97631474..f0dff145a 100644
          this.operation = operation;
          this.slot = slot;
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0155-Material-API-additions.patch
similarity index 91%
rename from Spigot-API-Patches/0154-Material-API-additions.patch
rename to Spigot-API-Patches/0155-Material-API-additions.patch
index 3f219fb31..c955b1752 100644
--- a/Spigot-API-Patches/0154-Material-API-additions.patch
+++ b/Spigot-API-Patches/0155-Material-API-additions.patch
@@ -1,11 +1,11 @@
-From d4d37f326a358195017d5c6cb1b72631cfeb1dfe Mon Sep 17 00:00:00 2001
+From fece5a49e0c86a1c0cb750f7aacdae6c919b319d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Oct 2018 21:14:29 -0400
 Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 6120955b1..c628a9349 100644
+index 6120955b..c628a934 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -74,6 +74,7 @@ import org.jetbrains.annotations.Nullable;
@@ -40,5 +40,5 @@ index 6120955b1..c628a9349 100644
       * Do not use for any reason.
       *
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0156-Add-Material-Tags.patch
similarity index 99%
rename from Spigot-API-Patches/0155-Add-Material-Tags.patch
rename to Spigot-API-Patches/0156-Add-Material-Tags.patch
index 4c6026598..4a1d5f4bd 100644
--- a/Spigot-API-Patches/0155-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0156-Add-Material-Tags.patch
@@ -1,4 +1,4 @@
-From 990878599bcd6903ac503c61a7ad30242dad92ec Mon Sep 17 00:00:00 2001
+From 09e55e7e559803535279eafbb816285bd1b2f8dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 17 Jul 2018 01:27:15 -0400
 Subject: [PATCH] Add Material Tags
@@ -8,7 +8,7 @@ are related to each other by a trait.
 
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
 new file mode 100644
-index 000000000..c91ea2a06
+index 00000000..c91ea2a0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
 @@ -0,0 +1,190 @@
@@ -204,7 +204,7 @@ index 000000000..c91ea2a06
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 000000000..660191c24
+index 00000000..660191c2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 @@ -0,0 +1,382 @@
@@ -592,7 +592,7 @@ index 000000000..660191c24
 +}
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644
-index 000000000..328c51471
+index 00000000..328c5147
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 @@ -0,0 +1,25 @@
@@ -622,7 +622,7 @@ index 000000000..328c51471
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 2d8403206..613675c3b 100644
+index 2d840320..613675c3 100644
 --- a/src/test/java/org/bukkit/TestServer.java
 +++ b/src/test/java/org/bukkit/TestServer.java
 @@ -30,6 +30,16 @@ public class TestServer implements InvocationHandler {
@@ -643,5 +643,5 @@ index 2d8403206..613675c3b 100644
                      Server.class.getMethod("getPluginManager"),
                      new MethodHandler() {
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch
index 4a12b028c..c42b730c1 100644
--- a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 2ab267b8452cec910e100702428427af8bc1a020 Mon Sep 17 00:00:00 2001
+From 51548bbf5aeeb8f3a3de2a0e3dced36cfad2d0f1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:09 -0500
 Subject: [PATCH] Allow setting the vex's summoner
 
 
 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index 6b61c4ab7..c34a3ea7b 100644
+index 6b61c4ab..c34a3ea7 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
 @@ -1,5 +1,7 @@
@@ -39,5 +39,5 @@ index 6b61c4ab7..c34a3ea7b 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch
index a1ac224bf..77349b847 100644
--- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 651f32be8d3fc9ddc408dcccfe8d888692ccd2cf Mon Sep 17 00:00:00 2001
+From 0c9f9a99d36b102cc16c1ac0c7482020fd4100a8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 000000000..f52644fab
+index 00000000..f52644fa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 000000000..f52644fab
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4dec50caf..956d68867 100644
+index 4dec50ca..956d6886 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -104,5 +104,5 @@ index 4dec50caf..956d68867 100644
  
      /**
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0159-Add-sun-related-API.patch
similarity index 90%
rename from Spigot-API-Patches/0158-Add-sun-related-API.patch
rename to Spigot-API-Patches/0159-Add-sun-related-API.patch
index 72822eb75..990987d79 100644
--- a/Spigot-API-Patches/0158-Add-sun-related-API.patch
+++ b/Spigot-API-Patches/0159-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From c6e637e02b40c9f3f776f69f381303f107e69b28 Mon Sep 17 00:00:00 2001
+From 379c946835805584f3916a588cc3f4ab0fd39eb1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6b91635fe..3d8ff98a8 100644
+index 6b91635f..3d8ff98a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1518,6 +1518,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -26,7 +26,7 @@ index 6b91635fe..3d8ff98a8 100644
       * Returns whether the world has an ongoing storm.
       *
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index afdc103fe..784db447d 100644
+index afdc103f..784db447 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -16,6 +16,13 @@ public interface Mob extends LivingEntity, Lootable {
@@ -44,5 +44,5 @@ index afdc103fe..784db447d 100644
  
      /**
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0160-Here-s-Johnny.patch
similarity index 93%
rename from Spigot-API-Patches/0159-Here-s-Johnny.patch
rename to Spigot-API-Patches/0160-Here-s-Johnny.patch
index d28bd3d3a..90e51381b 100644
--- a/Spigot-API-Patches/0159-Here-s-Johnny.patch
+++ b/Spigot-API-Patches/0160-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 28375eab2740571d7b9ab080ff28d55cf88c05b0 Mon Sep 17 00:00:00 2001
+From e21b9c46b962bc38d364e12be6f4cdea7a3f976a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:16 -0500
 Subject: [PATCH] Here's Johnny!
 
 
 diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java
-index b8ea68a8f..c5d9e76a6 100644
+index b8ea68a8..c5d9e76a 100644
 --- a/src/main/java/org/bukkit/entity/Vindicator.java
 +++ b/src/main/java/org/bukkit/entity/Vindicator.java
 @@ -3,4 +3,30 @@ package org.bukkit.entity;
@@ -41,5 +41,5 @@ index b8ea68a8f..c5d9e76a6 100644
 +    // Paper end
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0161-Turtle-API.patch
similarity index 97%
rename from Spigot-API-Patches/0160-Turtle-API.patch
rename to Spigot-API-Patches/0161-Turtle-API.patch
index 91285703e..9ea9b82f1 100644
--- a/Spigot-API-Patches/0160-Turtle-API.patch
+++ b/Spigot-API-Patches/0161-Turtle-API.patch
@@ -1,4 +1,4 @@
-From 93d7e253dd01d49f7dfdf75cc569fe077a335b6b Mon Sep 17 00:00:00 2001
+From 923bcf4b55c82138f234eed513f8879127b2bbe7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 17:08:09 -0500
 Subject: [PATCH] Turtle API
@@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
 new file mode 100644
-index 000000000..021356d15
+index 00000000..021356d1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
 @@ -0,0 +1,49 @@
@@ -61,7 +61,7 @@ index 000000000..021356d15
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 new file mode 100644
-index 000000000..a315c5185
+index 00000000..a315c518
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 @@ -0,0 +1,87 @@
@@ -154,7 +154,7 @@ index 000000000..a315c5185
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
 new file mode 100644
-index 000000000..abeb24fcc
+index 00000000..abeb24fc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
 @@ -0,0 +1,62 @@
@@ -221,7 +221,7 @@ index 000000000..abeb24fcc
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
-index 0a4cd2993..5375ea140 100644
+index 0a4cd299..5375ea14 100644
 --- a/src/main/java/org/bukkit/entity/Turtle.java
 +++ b/src/main/java/org/bukkit/entity/Turtle.java
 @@ -1,6 +1,55 @@
@@ -282,5 +282,5 @@ index 0a4cd2993..5375ea140 100644
 +    // Paper end
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 93%
rename from Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 7b1b36225..a183b0cf8 100644
--- a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 3f5b8f92e4b73c627c658d72067ff46ae36f0015 Mon Sep 17 00:00:00 2001
+From ae5ce884e6e5bee712aeffd645155caeb706448c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:13 -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/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index cb9e9f369..a15f70ff4 100644
+index cb9e9f36..a15f70ff 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack;
@@ -57,5 +57,5 @@ index cb9e9f369..a15f70ff4 100644
      // Paper end
  }
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0163-Add-spectator-target-events.patch
similarity index 97%
rename from Spigot-API-Patches/0162-Add-spectator-target-events.patch
rename to Spigot-API-Patches/0163-Add-spectator-target-events.patch
index 94dd0ef29..737fe425e 100644
--- a/Spigot-API-Patches/0162-Add-spectator-target-events.patch
+++ b/Spigot-API-Patches/0163-Add-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From bf13bc9b676e4081be6052781074e45aabd3f4ef Mon Sep 17 00:00:00 2001
+From fd64305843cdc2eb3b4190820f259edf3a08d9a9 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:30:56 -0500
 Subject: [PATCH] Add spectator target events
@@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
 new file mode 100644
-index 000000000..b8ec7ef2d
+index 00000000..b8ec7ef2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
 @@ -0,0 +1,67 @@
@@ -81,7 +81,7 @@ index 000000000..b8ec7ef2d
 +
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
 new file mode 100644
-index 000000000..693d119ab
+index 00000000..693d119a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
 @@ -0,0 +1,54 @@
@@ -140,5 +140,5 @@ index 000000000..693d119ab
 +    }
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0164-Add-more-Witch-API.patch
similarity index 93%
rename from Spigot-API-Patches/0163-Add-more-Witch-API.patch
rename to Spigot-API-Patches/0164-Add-more-Witch-API.patch
index a4c58fad9..7e075354e 100644
--- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/0164-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From 068856b69122e8ab43569374510bc6e600b0f93e Mon Sep 17 00:00:00 2001
+From 21d9b029cdd5e1dd73ff4ece26a7341d82fa58fd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 03:47:26 -0500
 Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index 4b27f6890..1828b2ced 100644
+index 4b27f689..1828b2ce 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
 @@ -2,8 +2,43 @@ package org.bukkit.entity;
@@ -54,5 +54,5 @@ index 4b27f6890..1828b2ced 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
similarity index 92%
rename from Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
rename to Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
index a6076cbfb..8d94328b2 100644
--- a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From b7cacf36728e66ddc98dcf78bd25bca50f64c54c Mon Sep 17 00:00:00 2001
+From b15f7b990de34ce684599ca6515f879f1a2545b3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:44:54 +0000
 Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 19fb0e5d2..6b0a09067 100644
+index 19fb0e5d..6b0a0906 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1589,6 +1589,15 @@ public final class Bukkit {
@@ -25,7 +25,7 @@ index 19fb0e5d2..6b0a09067 100644
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1df58f72a..66d22ba79 100644
+index 1df58f72..66d22ba7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1392,6 +1392,13 @@ public interface Server extends PluginMessageRecipient {
@@ -43,7 +43,7 @@ index 1df58f72a..66d22ba79 100644
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index c2c19ed42..f0222fc27 100644
+index c2c19ed4..f0222fc2 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -187,7 +187,7 @@ public abstract class Command {
@@ -56,5 +56,5 @@ index c2c19ed42..f0222fc27 100644
              for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
                  target.sendMessage(line);
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 96%
rename from Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 5217c6e06..4b097e611 100644
--- a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -1,4 +1,4 @@
-From e97571dcd023a7f76827b4bc9180cc4fe5af2a41 Mon Sep 17 00:00:00 2001
+From 5a2e30487b3a170f81c18af60314b49c0767fdfe Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
-index 69c9e499a..f0c0bae56 100644
+index 69c9e499..f0c0bae5 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -64,7 +64,7 @@ index 69c9e499a..f0c0bae56 100644
      @Override
      public HandlerList getHandlers() {
 diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index a473b2c6e..a5b4aed52 100644
+index a473b2c6..a5b4aed5 100644
 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 @@ -16,11 +16,20 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable
@@ -108,5 +108,5 @@ index a473b2c6e..a5b4aed52 100644
      @Override
      public HandlerList getHandlers()
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0167-Add-more-Zombie-API.patch
similarity index 94%
rename from Spigot-API-Patches/0166-Add-more-Zombie-API.patch
rename to Spigot-API-Patches/0167-Add-more-Zombie-API.patch
index c359b2db2..84bbda9e6 100644
--- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
+++ b/Spigot-API-Patches/0167-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From fdbcb1a6bb278f25aaa97c8c6f313710727ec608 Mon Sep 17 00:00:00 2001
+From 088a4d4d3a4b77cb4b258bb325ea4bb92cb5b2fc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:51 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index ee2e70c67..74d6529a1 100644
+index ee2e70c6..74d6529a 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -86,4 +86,55 @@ public interface Zombie extends Monster {
@@ -65,5 +65,5 @@ index ee2e70c67..74d6529a1 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 93%
rename from Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
rename to Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
index 1b6d278b3..392c456de 100644
--- a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
@@ -1,11 +1,11 @@
-From c1b1907746b894381dc0eace9190858895d9555f Mon Sep 17 00:00:00 2001
+From 7b9013c66aee00fbbc3eb414de015d6907fb0b16 Mon Sep 17 00:00:00 2001
 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 Date: Tue, 23 Oct 2018 19:32:55 +0300
 Subject: [PATCH] Change the reserved channel check to be sensible
 
 
 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 8227b375e..cc750eb3e 100644
+index 8227b375..cc750eb3 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 @@ -171,7 +171,7 @@ public class StandardMessenger implements Messenger {
@@ -18,7 +18,7 @@ index 8227b375e..cc750eb3e 100644
  
      public void registerOutgoingPluginChannel(@NotNull Plugin plugin, @NotNull String channel) {
 diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-index c15fa0039..31ff2f61d 100644
+index c15fa003..31ff2f61 100644
 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 @@ -25,8 +25,8 @@ public class StandardMessengerTest {
@@ -33,5 +33,5 @@ index c15fa0039..31ff2f61d 100644
      }
  
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch
index de4e6118a..2e56d1043 100644
--- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From dafaf73dbb7c18f78952f41aea292a09461cea3c Mon Sep 17 00:00:00 2001
+From 8eb7bcda4f5274584f66d7e5d9d972898a553f6d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:06 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -35,7 +35,7 @@ is undefined.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
 new file mode 100644
-index 000000000..12c1c6fe9
+index 00000000..12c1c6fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
 @@ -0,0 +1,95 @@
@@ -135,5 +135,5 @@ index 000000000..12c1c6fe9
 +    }
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 95%
rename from Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index ac96246d9..e3739e700 100644
--- a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From b4adc58e8917f706d5c28c3b4eaae7f125ccd697 Mon Sep 17 00:00:00 2001
+From 615b781d9c54ecfcfc43ae7096c0af3307f93119 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:31:12 -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/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 919d1b66a..30195c045 100644
+index 919d1b66..30195c04 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -145,7 +145,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -61,5 +61,5 @@ index 919d1b66a..30195c045 100644
 +
  }
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0171-BlockDestroyEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0170-BlockDestroyEvent.patch
rename to Spigot-API-Patches/0171-BlockDestroyEvent.patch
index 4308d142a..25fbac35d 100644
--- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch
+++ b/Spigot-API-Patches/0171-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From b8447c34438a04b863e11cfa7a0ddf0524eca24f Mon Sep 17 00:00:00 2001
+From 67d13b14545794f1f093315c2be8d819c05e278d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:19:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
 new file mode 100644
-index 000000000..3aee12f1c
+index 00000000..3aee12f1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
 @@ -0,0 +1,92 @@
@@ -109,5 +109,5 @@ index 000000000..3aee12f1c
 +    }
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 94%
rename from Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
rename to Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
index 25e43aa17..f249c813e 100644
--- a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -1,4 +1,4 @@
-From a8e16dac9cc63a3b497e841bab9ed83577784e9d Mon Sep 17 00:00:00 2001
+From 632bf8d0264ffc11ab61cfab018bb04113d044a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Jan 2014 19:13:57 -0500
 Subject: [PATCH] Add ItemStack Recipe API helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods
 Allows using ExactChoice Recipes with easier methodss
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 64a43f426..76b2dd7cb 100644
+index 64a43f42..76b2dd7c 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 @@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -24,7 +24,7 @@ index 64a43f426..76b2dd7cb 100644
       * Get a copy of the ingredients map.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 46a398e88..818bf2936 100644
+index 46a398e8..818bf293 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -69,5 +69,5 @@ index 46a398e88..818bf2936 100644
       * Removes an ingredient from the list.
       *
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch
similarity index 93%
rename from Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
rename to Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch
index 2fc4394dd..d2dc62fbd 100644
--- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
+++ b/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch
@@ -1,4 +1,4 @@
-From 5c5bc97af3a51e5f7352c07da4bf85e1a1127f0b Mon Sep 17 00:00:00 2001
+From 395fff0b77224ccc1cc19be8c5b3142dbb1d8c2a Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:04:43 +0200
 Subject: [PATCH] Add WhitelistToggleEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
 new file mode 100644
-index 000000000..fdd5eedb2
+index 00000000..fdd5eedb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
 @@ -0,0 +1,40 @@
@@ -51,5 +51,5 @@ index 000000000..fdd5eedb2
 +    }
 +}
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0174-Annotation-Test-changes.patch
similarity index 91%
rename from Spigot-API-Patches/0173-Annotation-Test-changes.patch
rename to Spigot-API-Patches/0174-Annotation-Test-changes.patch
index ed404fdb2..60bcb1e2e 100644
--- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch
+++ b/Spigot-API-Patches/0174-Annotation-Test-changes.patch
@@ -1,11 +1,11 @@
-From 320ed49d6420508ef894ccf099fa98d8b1681e40 Mon Sep 17 00:00:00 2001
+From 7269a08679d0faf34b9dd95a1d34869a6c2ba1e7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 17 Mar 2019 23:04:30 +0000
 Subject: [PATCH] Annotation Test changes
 
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index dfd6e137c..596f28076 100644
+index dfd6e137..596f2807 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -40,7 +40,17 @@ public class AnnotationTest {
@@ -28,5 +28,5 @@ index dfd6e137c..596f28076 100644
  
      @Test
 -- 
-2.21.0
+2.17.1
 
diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
similarity index 89%
rename from Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
rename to Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
index 810a65dcf..1fc25f242 100644
--- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 36b77e861dc654f330fea9b1ea3e1cb426e2eebf Mon Sep 17 00:00:00 2001
+From 66901f19f7ae0d30e59cbd768611e943d004ce98 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 73b75ffda..161518643 100644
+index 73b75ffd..16151864 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -632,5 +632,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -26,5 +26,5 @@ index 73b75ffda..161518643 100644
      // Paper end
  }
 -- 
-2.21.0
+2.17.1