diff --git a/Spigot-Server-Patches/PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/PlayerLaunchProjectileEvent.patch
index b48030343f..e12c3eb7eb 100644
--- a/Spigot-Server-Patches/PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/PlayerLaunchProjectileEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 7cc3c33b00..b92d39600c 100644
+index 7cc3c33b0..b92d39600 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -0,0 +0,0 @@ public class ItemEgg extends Item {
@@ -46,7 +46,7 @@ index 7cc3c33b00..b92d39600c 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index e4a9e4b7b7..8a02b69fb3 100644
+index e4a9e4b7b..570abc8b2 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -0,0 +0,0 @@ public class ItemEnderPearl extends Item {
@@ -64,7 +64,7 @@ index e4a9e4b7b7..8a02b69fb3 100644
 +                }
 +
 +                world.playSound((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_ENDER_PEARL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
-+                entityhuman.getCooldownTracker().a(this, 20);
++                entityhuman.getCooldownTracker().setCooldown(this, 20);
 +            } else {
 +                // Paper end
                  if (entityhuman instanceof EntityPlayer) {
@@ -94,7 +94,7 @@ index e4a9e4b7b7..8a02b69fb3 100644
          entityhuman.b(StatisticList.ITEM_USED.b(this));
          return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index 8d557cd85e..2a0aded65f 100644
+index 8d557cd85..2a0aded65 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -0,0 +0,0 @@ public class ItemExpBottle extends Item {
@@ -136,7 +136,7 @@ index 8d557cd85e..2a0aded65f 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index 1bddb78013..ca3f9f8cc9 100644
+index 1bddb7801..ca3f9f8cc 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -0,0 +0,0 @@ public class ItemLingeringPotion extends ItemPotion {
@@ -182,7 +182,7 @@ index 1bddb78013..ca3f9f8cc9 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index f5387a74ae..bbd22596e8 100644
+index f5387a74a..bbd22596e 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -0,0 +0,0 @@ public class ItemSnowball extends Item {
@@ -213,7 +213,7 @@ index f5387a74ae..bbd22596e8 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index bb9e606596..4460ddc6dc 100644
+index bb9e60659..4460ddc6d 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -0,0 +0,0 @@ public class ItemSplashPotion extends ItemPotion {