diff --git a/Spigot-API-Patches/RangedEntity-API.patch b/Spigot-API-Patches/RangedEntity-API.patch
index ee11f61c21..8059d862b2 100644
--- a/Spigot-API-Patches/RangedEntity-API.patch
+++ b/Spigot-API-Patches/RangedEntity-API.patch
@@ -43,6 +43,20 @@ index 000000000..f2e3233a3
 +        return isHandRaised();
 +    }
 +}
+diff --git a/src/main/java/org/bukkit/entity/Drowned.java b/src/main/java/org/bukkit/entity/Drowned.java
+index 1dee177ae..8d1ad9ef7 100644
+--- a/src/main/java/org/bukkit/entity/Drowned.java
++++ b/src/main/java/org/bukkit/entity/Drowned.java
+@@ -0,0 +0,0 @@
+ package org.bukkit.entity;
+ 
++import com.destroystokyo.paper.entity.RangedEntity;
++
+ /**
+  * Drowned zombie.
+  */
+-public interface Drowned extends Zombie { }
++public interface Drowned extends Zombie, RangedEntity { } // Paper
 diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java
 index 7c92c431b..14e6c5ee0 100644
 --- a/src/main/java/org/bukkit/entity/Illusioner.java
diff --git a/Spigot-Server-Patches/RangedEntity-API.patch b/Spigot-Server-Patches/RangedEntity-API.patch
index a3369d9b99..3dcc64f9ea 100644
--- a/Spigot-Server-Patches/RangedEntity-API.patch
+++ b/Spigot-Server-Patches/RangedEntity-API.patch
@@ -45,6 +45,24 @@ index b4178ce1e8..9b79ac77db 100644
 +    // - see EntitySkeletonAbstract melee goal
 +    void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
+index 6e41dfd923..390183fffd 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
+@@ -0,0 +0,0 @@
+ package org.bukkit.craftbukkit.entity;
+ 
++import com.destroystokyo.paper.entity.CraftRangedEntity;
+ import net.minecraft.server.EntityDrowned;
+ import org.bukkit.craftbukkit.CraftServer;
+ import org.bukkit.entity.Drowned;
+ import org.bukkit.entity.EntityType;
+ 
+-public class CraftDrowned extends CraftZombie implements Drowned {
++public class CraftDrowned extends CraftZombie implements Drowned, CraftRangedEntity<EntityDrowned> { // Paper
+ 
+     public CraftDrowned(CraftServer server, EntityDrowned entity) {
+         super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 index 2ec1af8be4..f31d3eed3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java