From 4ce8158350594ae2d173bf50f09583c86229d7ba Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Mon, 16 Jul 2018 08:51:34 +1000
Subject: [PATCH] Fish / Dolphin should be WaterMob, and WaterMob Creature

By: md_5 <git@md-5.net>
---
 .../main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java  | 2 +-
 .../src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java | 2 +-
 .../main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
index 7a838f3818..0399e6f51a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Dolphin;
 import org.bukkit.entity.EntityType;
 
-public class CraftDolphin extends CraftCreature implements Dolphin {
+public class CraftDolphin extends CraftWaterMob implements Dolphin {
 
     public CraftDolphin(CraftServer server, EntityDolphin entity) {
         super(server, entity);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
index aaa6bed335..6169119cf8 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
@@ -4,7 +4,7 @@ import net.minecraft.server.EntityFish;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Fish;
 
-public class CraftFish extends CraftCreature implements Fish {
+public class CraftFish extends CraftWaterMob implements Fish {
 
     public CraftFish(CraftServer server, EntityFish entity) {
         super(server, entity);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
index ee21d7b6e9..39e8d89bf4 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
@@ -3,10 +3,9 @@ package org.bukkit.craftbukkit.entity;
 import net.minecraft.server.EntityWaterAnimal;
 
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.WaterMob;
 
-public class CraftWaterMob extends CraftLivingEntity implements WaterMob {
+public class CraftWaterMob extends CraftCreature implements WaterMob {
 
     public CraftWaterMob(CraftServer server, EntityWaterAnimal entity) {
         super(server, entity);