summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityFish.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-01-30 16:15:17 +0100
committerErik Broes <erikbroes@grum.nl>2011-01-30 16:15:24 +0100
commitb2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1 (patch)
tree6fd5368cbcc0f2b922570827034d3f57a994b66f /src/main/java/net/minecraft/server/EntityFish.java
parent75ba9a0f2570798d9012e4f4377d903cd2904785 (diff)
downloadcraftbukkit-b2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1.tar
craftbukkit-b2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1.tar.gz
craftbukkit-b2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1.tar.lz
craftbukkit-b2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1.tar.xz
craftbukkit-b2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1.zip
Reworked getEntity; Hi instanceof, bay 16 classes
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFish.java')
-rwxr-xr-x[-rw-r--r--]src/main/java/net/minecraft/server/EntityFish.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index a654b0a5..d69e50ed 100644..100755
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -3,7 +3,6 @@ package net.minecraft.server;
import java.util.List;
// CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftFish;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
import org.bukkit.event.entity.EntityDamageEvent;
@@ -33,18 +32,12 @@ public class EntityFish extends Entity {
public EntityFish(World world) {
super(world);
this.a(0.25F, 0.25F);
-
- //CraftBukkit start
- CraftServer server = ((WorldServer) this.world).getServer();
- this.bukkitEntity = new CraftFish(server, this);
- //CraftBukkit end
}
protected void a() {}
public EntityFish(World world, EntityHuman entityhuman) {
- this(world); // CraftBukkit super->this so we assign the entity
-
+ super(world);
this.b = entityhuman;
this.b.hookedFish = this;
this.a(0.25F, 0.25F);