diff --git a/Spigot-Server-Patches/LivingEntity-setKiller.patch b/Spigot-Server-Patches/LivingEntity-setKiller.patch
index 83e3b672b1..535dedfa10 100644
--- a/Spigot-Server-Patches/LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/LivingEntity-setKiller.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1eafdecb4..f81622a34 100644
+index b9e106031..413bab0c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -15,7 +15,7 @@ index 1eafdecb4..f81622a34 100644
 +    // Paper start
 +    @Override
 +    public void setKiller(Player killer) {
-+        EntityPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
++        net.minecraft.server.EntityPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
 +        getHandle().killer = entityPlayer;
 +        getHandle().lastDamager = entityPlayer;
 +        getHandle().lastDamageByPlayerTime = entityPlayer == null ? 0 : 100; // 100 value taken from EntityLiving#damageEntity
diff --git a/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 3461e170e2..a02d51f117 100644
--- a/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -5,13 +5,14 @@ Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index ecfc316b..3f909c17 100644
+index d555597dc..f5419dea4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 @@ -0,0 +0,0 @@ public class CraftFish extends AbstractProjectile implements Fish {
+         Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");
          this.biteChance = chance;
      }
- 
++
 +    // Paper start
 +    @Override
 +    public void remove() {
@@ -21,8 +22,5 @@ index ecfc316b..3f909c17 100644
 +        }
 +    }
 +    // Paper end
-+
-     @Deprecated
-     public LivingEntity _INVALID_getShooter() {
-         return (LivingEntity) getShooter();
+ }
 --
\ No newline at end of file