diff options
author | sk89q <the.sk89q@gmail.com> | 2011-01-07 13:05:25 -0800 |
---|---|---|
committer | sk89q <the.sk89q@gmail.com> | 2011-01-07 13:05:25 -0800 |
commit | 22c2fdeaf07412cd25fba1ca330b278ed63d5734 (patch) | |
tree | 37f9aa7d9586ce971493b7a4c70508f02b32709a /src/main/java/org | |
parent | 592f510228b0c39d7b9c31163e3ab98bf41da28f (diff) | |
download | craftbukkit-22c2fdeaf07412cd25fba1ca330b278ed63d5734.tar craftbukkit-22c2fdeaf07412cd25fba1ca330b278ed63d5734.tar.gz craftbukkit-22c2fdeaf07412cd25fba1ca330b278ed63d5734.tar.lz craftbukkit-22c2fdeaf07412cd25fba1ca330b278ed63d5734.tar.xz craftbukkit-22c2fdeaf07412cd25fba1ca330b278ed63d5734.zip |
Implemented boat, fixed some event issues with minecarts, and implemented the events for boats that were implemented for minecarts.
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftBoat.java | 18 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftMinecart.java | 12 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftVehicle.java | 14 |
3 files changed, 32 insertions, 12 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/CraftBoat.java new file mode 100644 index 00000000..dd3acb62 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/CraftBoat.java @@ -0,0 +1,18 @@ +package org.bukkit.craftbukkit;
+
+import net.minecraft.server.EntityBoat;
+import org.bukkit.Boat;
+
+/**
+ * A minecart.
+ *
+ * @author sk89q
+ */
+public class CraftBoat extends CraftVehicle implements Boat {
+ protected EntityBoat boat;
+
+ public CraftBoat(CraftServer server, EntityBoat entity) {
+ super(server, entity);
+ boat = entity;
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java index 583f7dbd..0d55ad82 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftMinecart.java @@ -1,9 +1,7 @@ package org.bukkit.craftbukkit; import net.minecraft.server.EntityMinecart; -import org.bukkit.LivingEntity; import org.bukkit.Minecart; -import org.bukkit.Vector; /** * A minecart. @@ -38,16 +36,6 @@ public class CraftMinecart extends CraftVehicle implements Minecart { minecart = entity; } - public Vector getVelocity() { - return new Vector(minecart.s, minecart.t, minecart.u); - } - - public void setVelocity(Vector vel) { - minecart.s = vel.getX(); - minecart.t = vel.getY(); - minecart.u = vel.getZ(); - } - public void setDamage(int damage) { minecart.a = damage; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java index c978b8b7..42671c13 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftVehicle.java @@ -1,6 +1,7 @@ package org.bukkit.craftbukkit; import org.bukkit.Entity; +import org.bukkit.Vector; import org.bukkit.Vehicle; /** @@ -9,8 +10,11 @@ import org.bukkit.Vehicle; * @author sk89q */ public abstract class CraftVehicle extends CraftEntity implements Vehicle { + private net.minecraft.server.Entity vehicle; + public CraftVehicle(CraftServer server, net.minecraft.server.Entity entity) { super(server, entity); + vehicle = entity; } public Entity getPassenger() { @@ -20,4 +24,14 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle { public boolean isEmpty() { return getHandle().j == null; } + + public Vector getVelocity() { + return new Vector(vehicle.s, vehicle.t, vehicle.u); + } + + public void setVelocity(Vector vel) { + vehicle.s = vel.getX(); + vehicle.t = vel.getY(); + vehicle.u = vel.getZ(); + } } |