From 5f2c8108b776ab5710adfe597574fb0b7e929e36 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 17 Jan 2011 08:53:42 +0800 Subject: Updates to all Entities to use getBukkitEntity() any time an event is raised. Similar update to CraftVehicle and CraftLivingEntity --- src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 2 +- src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 8a3f274c..bf908e16 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -89,7 +89,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return null; } - org.bukkit.entity.Entity vehicle = ((CraftWorld)getWorld()).toCraftEntity(entity.k); + org.bukkit.entity.Entity vehicle = (entity.k.getBukkitEntity()); if (vehicle instanceof Vehicle) { return (Vehicle)vehicle; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java index 2a9a1fae..04d8d187 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java @@ -16,7 +16,7 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle { } public Entity getPassenger() { - return ((CraftWorld)getWorld()).toCraftEntity(getHandle().j); + return (getHandle().j.getBukkitEntity()); } public boolean setPassenger(Entity passenger) { -- cgit v1.2.3