Reworked getEntity; Hi instanceof, bay 16 classes

This commit is contained in:
Erik Broes
2011-01-30 16:15:17 +01:00
parent 75ba9a0f25
commit b2a0c5a2ae
32 changed files with 85 additions and 1797 deletions

12
src/main/java/net/minecraft/server/EntityEgg.java Normal file → Executable file
View File

@@ -6,7 +6,6 @@ import java.util.List;
import org.bukkit.entity.Egg;
import org.bukkit.entity.MobType;
import org.bukkit.entity.Player;
import org.bukkit.craftbukkit.entity.CraftEgg;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
@@ -30,18 +29,12 @@ public class EntityEgg extends Entity {
public EntityEgg(World world) {
super(world);
this.a(0.25F, 0.25F);
// CraftBukkit start
CraftServer server = ((WorldServer) this.world).getServer();
this.bukkitEntity = new CraftEgg(server, this);
// CraftBukkit end
}
protected void a() {}
public EntityEgg(World world, EntityLiving entityliving) {
this(world); // CraftBukkit super->this so we assign the entity
super(world);
this.ak = entityliving;
this.a(0.25F, 0.25F);
this.c(entityliving.locX, entityliving.locY + (double) entityliving.w(), entityliving.locZ, entityliving.yaw, entityliving.pitch);
@@ -59,8 +52,7 @@ public class EntityEgg extends Entity {
}
public EntityEgg(World world, double d0, double d1, double d2) {
this(world); // CraftBukkit super->this so we assign the entity
super(world);
this.al = 0;
this.a(0.25F, 0.25F);
this.a(d0, d1, d2);