From 3931be421eb55601623d1e2aae05a3508414f102 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Fri, 21 Jan 2011 16:21:19 -0800
Subject: [PATCH] Entity's bukkitEntity field now holds a CraftEntity by
default.
---
src/main/java/net/minecraft/server/Entity.java | 4 +++-
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 8fd6672a48..b95ef2b954 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 560ad6cca1..c37a150c63 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;