diff options
| author | sk89q <the.sk89q@gmail.com> | 2011-01-21 18:35:32 -0800 |
|---|---|---|
| committer | sk89q <the.sk89q@gmail.com> | 2011-01-21 18:35:32 -0800 |
| commit | d98c8e2100907c21f019e854a818a8426875b068 (patch) | |
| tree | 62dba44f9b408a12e20939b17ad4b4abcdb242fc /src | |
| parent | bf9d55d9ed24987197a82332fa67a26609ba4005 (diff) | |
| download | craftbukkit-d98c8e2100907c21f019e854a818a8426875b068.tar craftbukkit-d98c8e2100907c21f019e854a818a8426875b068.tar.gz craftbukkit-d98c8e2100907c21f019e854a818a8426875b068.tar.lz craftbukkit-d98c8e2100907c21f019e854a818a8426875b068.tar.xz craftbukkit-d98c8e2100907c21f019e854a818a8426875b068.zip | |
Revert "Entity's bukkitEntity field now holds a CraftEntity by default."
This reverts commit 7a64e864fc481f001812d78cc4d767872c458706.
Diffstat (limited to 'src')
| -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, 2 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index b95ef2b9..8fd6672a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2,8 +2,6 @@ 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; @@ -119,7 +117,7 @@ public abstract class Entity { af.a(0, ((Byte.valueOf((byte) 0)))); a(); - bukkitEntity = new CraftEntity(((WorldServer) l).getServer(), this); // CraftBukkit + bukkitEntity = null; // 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 c37a150c..560ad6cc 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 class CraftEntity implements org.bukkit.entity.Entity { +public abstract class CraftEntity implements org.bukkit.entity.Entity { protected final CraftServer server; private Entity entity; |