summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-16 08:51:34 +1000
committermd_5 <git@md-5.net>2018-07-16 08:51:34 +1000
commit10261f31d730455e64e5344648096ce58e9787e3 (patch)
treea5f2a56f8c097ff09705dc270d35f220f0955232 /src
parentb8ea9ec8447a42d8e2c04c17727618aaa242894b (diff)
downloadcraftbukkit-10261f31d730455e64e5344648096ce58e9787e3.tar
craftbukkit-10261f31d730455e64e5344648096ce58e9787e3.tar.gz
craftbukkit-10261f31d730455e64e5344648096ce58e9787e3.tar.lz
craftbukkit-10261f31d730455e64e5344648096ce58e9787e3.tar.xz
craftbukkit-10261f31d730455e64e5344648096ce58e9787e3.zip
Fish / Dolphin should be WaterMob, and WaterMob Creature
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java3
3 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
index 7a838f38..0399e6f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java
+++ b/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/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
index aaa6bed3..6169119c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
+++ b/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/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
index ee21d7b6..39e8d89b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
+++ b/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);