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/Entity.java Normal file → Executable file
View File

@@ -115,12 +115,7 @@ public abstract class Entity {
this.a(0.0D, 0.0D, 0.0D);
this.datawatcher.a(0, Byte.valueOf((byte) 0));
this.a();
// CraftBukkit start
bukkitEntity = null;
}
protected org.bukkit.entity.Entity bukkitEntity;
// CraftBukkit end
protected abstract void a();
@@ -954,8 +949,13 @@ public abstract class Entity {
setPassengerOf(entity);
}
protected org.bukkit.entity.Entity bukkitEntity;
public org.bukkit.entity.Entity getBukkitEntity(){
return this.bukkitEntity;
if (bukkitEntity == null) {
bukkitEntity = org.bukkit.craftbukkit.entity.CraftEntity.getEntity(((WorldServer) this.world).getServer(), this);
}
return bukkitEntity;
}
public void setPassengerOf(Entity entity) {