diff options
| author | sk89q <the.sk89q@gmail.com> | 2011-01-21 16:21:19 -0800 |
|---|---|---|
| committer | sk89q <the.sk89q@gmail.com> | 2011-01-21 16:21:19 -0800 |
| commit | 3931be421eb55601623d1e2aae05a3508414f102 (patch) | |
| tree | c76d31e19c4a587f13e9dfabcf508875fe09491c | |
| parent | efdf9b8af746373105a1d4bb6e526828d6bb8122 (diff) | |
| download | craftbukkit-3931be421eb55601623d1e2aae05a3508414f102.tar craftbukkit-3931be421eb55601623d1e2aae05a3508414f102.tar.gz craftbukkit-3931be421eb55601623d1e2aae05a3508414f102.tar.lz craftbukkit-3931be421eb55601623d1e2aae05a3508414f102.tar.xz craftbukkit-3931be421eb55601623d1e2aae05a3508414f102.zip | |
Entity's bukkitEntity field now holds a CraftEntity by default.
| -rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 8fd6672a..b95ef2b9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2,6 +2,8 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.event.Event.Type; import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent; @@ -117,7 +119,7 @@ public abstract class Entity { af.a(0, ((Byte.valueOf((byte) 0)))); a(); - bukkitEntity = null; // CraftBukkit + bukkitEntity = new CraftEntity(((WorldServer) l).getServer(), this); // CraftBukkit } protected abstract void a(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 560ad6cc..c37a150c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -7,7 +7,7 @@ import org.bukkit.World; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.util.Vector; -public abstract class CraftEntity implements org.bukkit.entity.Entity { +public class CraftEntity implements org.bukkit.entity.Entity { protected final CraftServer server; private Entity entity; |