diff options
| author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-17 08:53:42 +0800 |
|---|---|---|
| committer | Dinner Bone <dinnerbone@dinnerbone.com> | 2011-01-18 00:13:32 +0800 |
| commit | 5f2c8108b776ab5710adfe597574fb0b7e929e36 (patch) | |
| tree | c519cb90c2b68c53f0851ac82771d111602a3f79 /src/main/java/org | |
| parent | 3400eafaf1ba56b43dbdbb9e0aac3ebf5930538b (diff) | |
| download | craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar.gz craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar.lz craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar.xz craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.zip | |
Updates to all Entities to use getBukkitEntity() any time an event is
raised.
Similar update to CraftVehicle and CraftLivingEntity
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java | 2 |
2 files changed, 2 insertions, 2 deletions
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) { |