diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-01-30 16:15:17 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-01-30 16:15:24 +0100 |
commit | b2a0c5a2ae216b1e778d5e03fd97dd9ebaf112a1 (patch) | |
tree | 6fd5368cbcc0f2b922570827034d3f57a994b66f /src/main/java/net/minecraft/server/Entity.java | |
parent | 75ba9a0f2570798d9012e4f4377d903cd2904785 (diff) | |
download | craftbukkit-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/Entity.java')
-rwxr-xr-x[-rw-r--r--] | src/main/java/net/minecraft/server/Entity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 74a2ac9c..2eab3c43 100644..100755 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -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) { |