summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/Entity.java4
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java2
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;