diff --git a/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index c30de9047e..c9e7ffe6d9 100644
--- a/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/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
 @@ -0,0 +0,0 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
diff --git a/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch
index 7071b2c5e8..3d5e5a34ea 100644
--- a/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch
@@ -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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
diff --git a/Spigot-API-Patches/Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/Add-ItemStackRecipeChoice-Draft-API.patch
index 6001f94448..3e2d518f36 100644
--- a/Spigot-API-Patches/Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/Spigot-API-Patches/Add-ItemStackRecipeChoice-Draft-API.patch
@@ -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 +0,0 @@
diff --git a/Spigot-API-Patches/Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/Add-LivingEntity-getTargetEntity.patch
index c02a504874..18bbf5b41e 100644
--- a/Spigot-API-Patches/Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/Add-LivingEntity-getTargetEntity.patch
@@ -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 +0,0 @@
@@ -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
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/Spigot-API-Patches/Add-Material-Tags.patch b/Spigot-API-Patches/Add-Material-Tags.patch
index e33f3d51d4..6a6d0fed60 100644
--- a/Spigot-API-Patches/Add-Material-Tags.patch
+++ b/Spigot-API-Patches/Add-Material-Tags.patch
@@ -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 +0,0 @@
@@ -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 +0,0 @@
@@ -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 +0,0 @@
@@ -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
 @@ -0,0 +0,0 @@ public class TestServer implements InvocationHandler {
diff --git a/Spigot-API-Patches/Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/Add-PlayerConnectionCloseEvent.patch
index de5db59aac..3cda1dc7e1 100644
--- a/Spigot-API-Patches/Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerConnectionCloseEvent.patch
@@ -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 +0,0 @@
diff --git a/Spigot-API-Patches/Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/Add-WhitelistToggleEvent.patch
index 371239c150..c085067fe3 100644
--- a/Spigot-API-Patches/Add-WhitelistToggleEvent.patch
+++ b/Spigot-API-Patches/Add-WhitelistToggleEvent.patch
@@ -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 +0,0 @@
diff --git a/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 92b31f4d65..2fbcd9e87c 100644
--- a/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -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 +0,0 @@
@@ -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 +0,0 @@
@@ -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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
diff --git a/Spigot-API-Patches/Add-getTPS-method.patch b/Spigot-API-Patches/Add-getTPS-method.patch
index 41ce46c5a5..996261bdbf 100644
--- a/Spigot-API-Patches/Add-getTPS-method.patch
+++ b/Spigot-API-Patches/Add-getTPS-method.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
diff --git a/Spigot-API-Patches/Add-more-Witch-API.patch b/Spigot-API-Patches/Add-more-Witch-API.patch
index c035ca3db1..b7edb225b6 100644
--- a/Spigot-API-Patches/Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/Add-more-Witch-API.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ package org.bukkit.entity;
diff --git a/Spigot-API-Patches/Add-more-Zombie-API.patch b/Spigot-API-Patches/Add-more-Zombie-API.patch
index aeaf741e87..82bc9d7bbf 100644
--- a/Spigot-API-Patches/Add-more-Zombie-API.patch
+++ b/Spigot-API-Patches/Add-more-Zombie-API.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ public interface Zombie extends Monster {
diff --git a/Spigot-API-Patches/Add-spectator-target-events.patch b/Spigot-API-Patches/Add-spectator-target-events.patch
index d35da72066..4b7a8d26b6 100644
--- a/Spigot-API-Patches/Add-spectator-target-events.patch
+++ b/Spigot-API-Patches/Add-spectator-target-events.patch
@@ -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 +0,0 @@
@@ -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 +0,0 @@
diff --git a/Spigot-API-Patches/Add-sun-related-API.patch b/Spigot-API-Patches/Add-sun-related-API.patch
index 6048868b15..ac326e04e0 100644
--- a/Spigot-API-Patches/Add-sun-related-API.patch
+++ b/Spigot-API-Patches/Add-sun-related-API.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public interface Mob extends LivingEntity, Lootable {
diff --git a/Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
index 8a36888663..6a4269ad6b 100644
--- a/Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow setting the vex's summoner
 
 
 diff --git a/src/main/java/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
 @@ -0,0 +0,0 @@
diff --git a/Spigot-API-Patches/Annotation-Test-changes.patch b/Spigot-API-Patches/Annotation-Test-changes.patch
index 637156d334..1ecbd9a57a 100644
--- a/Spigot-API-Patches/Annotation-Test-changes.patch
+++ b/Spigot-API-Patches/Annotation-Test-changes.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ public class AnnotationTest {
diff --git a/Spigot-API-Patches/BlockDestroyEvent.patch b/Spigot-API-Patches/BlockDestroyEvent.patch
index 6943350ed9..a9aa82f7f4 100644
--- a/Spigot-API-Patches/BlockDestroyEvent.patch
+++ b/Spigot-API-Patches/BlockDestroyEvent.patch
@@ -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 +0,0 @@
diff --git a/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
index f0f62cb356..7997b7f8fc 100644
--- a/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public class StandardMessengerTest {
diff --git a/Spigot-API-Patches/Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/Entity-getEntitySpawnReason.patch
index 717b08dfc2..44a944dfd6 100644
--- a/Spigot-API-Patches/Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/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
 @@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
diff --git a/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch
new file mode 100644
index 0000000000..b7611d03e9
--- /dev/null
+++ b/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 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
+@@ -0,0 +0,0 @@ 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
+--
\ No newline at end of file
diff --git a/Spigot-API-Patches/Here-s-Johnny.patch b/Spigot-API-Patches/Here-s-Johnny.patch
index da750d1cc7..57c1be6c4d 100644
--- a/Spigot-API-Patches/Here-s-Johnny.patch
+++ b/Spigot-API-Patches/Here-s-Johnny.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ package org.bukkit.entity;
diff --git a/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
index 5c8c108963..effa04bb75 100644
--- a/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/Implement-furnace-cook-speed-multiplier-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/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
 @@ -0,0 +0,0 @@ public interface Furnace extends Container, Nameable {
diff --git a/Spigot-API-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch
index e6ddc21c90..cc0885a155 100644
--- a/Spigot-API-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-API-Patches/Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -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
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.ItemStack;
diff --git a/Spigot-API-Patches/Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/Make-the-default-permission-message-configurable.patch
index 795efc684d..18be0e0668 100644
--- a/Spigot-API-Patches/Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/Make-the-default-permission-message-configurable.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public abstract class Command {
diff --git a/Spigot-API-Patches/Material-API-additions.patch b/Spigot-API-Patches/Material-API-additions.patch
index 7b225fb99a..84e67ddf33 100644
--- a/Spigot-API-Patches/Material-API-additions.patch
+++ b/Spigot-API-Patches/Material-API-additions.patch
@@ -5,7 +5,7 @@ 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
 @@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
diff --git a/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
index 4935c35ab2..5ea6b0a1db 100644
--- a/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
@@ -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
 @@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
diff --git a/Spigot-API-Patches/PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/PreSpawnerSpawnEvent.patch
index c09359cd7f..5d49a4293c 100644
--- a/Spigot-API-Patches/PreSpawnerSpawnEvent.patch
+++ b/Spigot-API-Patches/PreSpawnerSpawnEvent.patch
@@ -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 +0,0 @@
diff --git a/Spigot-API-Patches/Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/Remove-Precondition-on-name-for-AttributeModifier.patch
index 95396d6c8a..8ef10272a6 100644
--- a/Spigot-API-Patches/Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -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
 @@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable {
diff --git a/Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch
index 60f5475d71..150baef416 100644
--- a/Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -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
 @@ -0,0 +0,0 @@ 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
 @@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable
diff --git a/Spigot-API-Patches/Turtle-API.patch b/Spigot-API-Patches/Turtle-API.patch
index f8ce1cee56..df574dd6bb 100644
--- a/Spigot-API-Patches/Turtle-API.patch
+++ b/Spigot-API-Patches/Turtle-API.patch
@@ -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 +0,0 @@
@@ -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 +0,0 @@
@@ -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 +0,0 @@
@@ -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
 @@ -0,0 +0,0 @@