diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 8fdfa1d7..6e99ee7d 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -286,6 +286,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
      */
     public void wakeup(boolean setSpawnLocation);
 
+    /**
+     * Make the player start a riptide spin attack.
+     * @param duration attack duration in ticks.
+     * @param attackStrength attack strength
+     * @param attackItem item used to attack.
+     */
+    public void startRiptideAttack(int duration, float attackStrength, @Nullable ItemStack attackItem);
+
     /**
      * Gets the location of the bed the player is currently sleeping in
      *
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 60bcf0c7..b5a302ba 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -510,7 +510,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
     public void setSwimming(boolean swimming);
 
     /**
-     * Checks to see if an entity is currently using the Riptide enchantment.
+     * Checks to see if an entity is currently riptiding.
      *
      * @return True if this entity is currently riptiding.
      */
@@ -518,21 +518,14 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
 
     /**
      * Makes entity start or stop riptiding.
-     * Note: This does not damage living entities.
+     * <p>
+     * Note: This does not damage attackable entities.
      *
      * @param riptiding whether the entity should start riptiding.
-     * @see #startRiptideAttack(int, float, ItemStack)
+     * @see HumanEntity#startRiptideAttack(int, float, ItemStack)
      */
     public void setRiptiding(boolean riptiding);
 
-    /**
-     * Makes the entity use their current item to start a riptide attack.
-     * @param duration attack duration in ticks.
-     * @param attackStrength attack strength
-     * @param attackItem item used to attack.
-     */
-    public void startRiptideAttack(int duration, float attackStrength, @Nullable ItemStack attackItem);
-
     /**
      * Returns whether this entity is slumbering.
      *