diff options
author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-23 23:23:13 +1100 |
---|---|---|
committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-23 23:23:13 +1100 |
commit | a809e4e6e32e194c288723ceb2e1534bbddea174 (patch) | |
tree | ceebf1bdff232e048d8d9b669e267a6598d2af13 /src/main/java/org | |
parent | 9cd81ddd6d78d625bab88ee0ab0bc6080447fc96 (diff) | |
download | craftbukkit-a809e4e6e32e194c288723ceb2e1534bbddea174.tar craftbukkit-a809e4e6e32e194c288723ceb2e1534bbddea174.tar.gz craftbukkit-a809e4e6e32e194c288723ceb2e1534bbddea174.tar.lz craftbukkit-a809e4e6e32e194c288723ceb2e1534bbddea174.tar.xz craftbukkit-a809e4e6e32e194c288723ceb2e1534bbddea174.zip |
removed all instances of new CraftEntity* where appropriate.
Entity.getBukkitEntity() is now used instead.
Diffstat (limited to 'src/main/java/org')
4 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftMappable.java b/src/main/java/org/bukkit/craftbukkit/CraftMappable.java index 8a0de5e2..da0c2bce 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftMappable.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftMappable.java @@ -8,6 +8,7 @@ import org.bukkit.craftbukkit.entity.CraftEntity; * * @author sk89q */ +/**@deprecated*/ public interface CraftMappable { /** * Gets the CraftEntity version. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index ea89b7b1..a03d26db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -151,7 +151,7 @@ public class CraftWorld implements World { CraftMinecart.Type.Minecart.getId() ); world.a(minecart); - return new CraftMinecart(world.getServer(), minecart); + return (Minecart) minecart.getBukkitEntity(); } public StorageMinecart spawnStorageMinecart(Location loc) { @@ -163,7 +163,7 @@ public class CraftWorld implements World { CraftMinecart.Type.StorageMinecart.getId() ); world.a(minecart); - return new CraftStorageMinecart(world.getServer(), minecart); + return (StorageMinecart) minecart.getBukkitEntity(); } public PoweredMinecart spawnPoweredMinecart(Location loc) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java index 0463bfd8..b0912c31 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java @@ -52,6 +52,8 @@ public class CraftMinecart extends CraftVehicle implements Minecart { * @param server * @param minecart * @return + * + * @deprecated */ public static CraftMinecart getCraftMinecart(CraftServer server, EntityMinecart minecart) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java index 3fbd7c00..e1cca613 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java @@ -1,7 +1,6 @@ package org.bukkit.craftbukkit.entity; import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.Vehicle; @@ -20,8 +19,12 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle { } public boolean setPassenger(Entity passenger) { - ((CraftEntity)passenger).getHandle().setPassengerOf(getHandle()); - return true; + if(passenger instanceof CraftEntity){ + ((CraftEntity)passenger).getHandle().setPassengerOf(getHandle()); + return true; + } else { + return false; + } } public boolean isEmpty() { |