Let's handle (bwhaha) the Craft* entities a bit better.

This commit is contained in:
Erik Broes
2011-03-01 17:08:18 +01:00
parent e6583c0d48
commit f54469f314
8 changed files with 52 additions and 53 deletions

View File

@@ -7,34 +7,30 @@ import org.bukkit.entity.Creature;
import org.bukkit.entity.LivingEntity;
public class CraftCreature extends CraftLivingEntity implements Creature{
private EntityCreature entity;
public CraftCreature(CraftServer server, EntityCreature entity) {
super(server, entity);
this.entity = entity;
}
public void setTarget(LivingEntity target) {
EntityCreature entity = getHandle();
if (target == null) {
entity.d = null;
} else if (target instanceof CraftLivingEntity) {
EntityLiving victim = ((CraftLivingEntity)target).getHandle();
EntityLiving victim = ((CraftLivingEntity) target).getHandle();
entity.d = victim;
entity.a = entity.world.a(entity, entity.d, 16.0F);
}
}
public CraftLivingEntity getTarget() {
if (entity.d == null) {
return null;
} else {
return (CraftLivingEntity)entity.d.getBukkitEntity();
}
if (getHandle().d == null) return null;
return (CraftLivingEntity) getHandle().d.getBukkitEntity();
}
@Override
public EntityCreature getHandle() {
return entity;
return (EntityCreature) entity;
}
@Override