diff options
| author | sk89q <the.sk89q@gmail.com> | 2011-01-03 17:26:34 +0800 |
|---|---|---|
| committer | Dinner Bone <dinnerbone@dinnerbone.com> | 2011-01-03 22:24:44 +0800 |
| commit | 135c6f240a4f6c82f9c8f127a4bd28b966fa7c64 (patch) | |
| tree | 4df5e7cf90886d8922c101fcb96fe46e0121befc /src | |
| parent | e05708c9df2e0cd3d2fad3a7c36de1bc762779e5 (diff) | |
| download | bukkit-135c6f240a4f6c82f9c8f127a4bd28b966fa7c64.tar bukkit-135c6f240a4f6c82f9c8f127a4bd28b966fa7c64.tar.gz bukkit-135c6f240a4f6c82f9c8f127a4bd28b966fa7c64.tar.lz bukkit-135c6f240a4f6c82f9c8f127a4bd28b966fa7c64.tar.xz bukkit-135c6f240a4f6c82f9c8f127a4bd28b966fa7c64.zip | |
Change vehicle hook changes.
Diffstat (limited to 'src')
6 files changed, 44 insertions, 32 deletions
diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java index 51992ad3..812e007d 100644 --- a/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java @@ -337,7 +337,7 @@ public abstract class Event { /** * Called when a vehicle is placed by a player */ - VEHICLE_PLACE (Category.VEHICLE), + VEHICLE_CREATE (Category.VEHICLE), /** * Called when a vehicle is damaged by a LivingEntity diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java new file mode 100644 index 00000000..efc76094 --- /dev/null +++ b/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java @@ -0,0 +1,15 @@ +package org.bukkit.event.vehicle;
+
+import org.bukkit.Vehicle;
+
+/**
+ * Raised when a vehicle is created.
+ *
+ * @author sk89q
+ */
+public class VehicleCreateEvent extends VehicleEvent {
+ public VehicleCreateEvent(Type type, Vehicle vehicle) {
+ super(type, vehicle);
+ }
+
+}
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java index fd112bd6..3d762e8c 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java @@ -1,5 +1,6 @@ package org.bukkit.event.vehicle;
+import org.bukkit.Entity;
import org.bukkit.Vehicle;
import org.bukkit.event.Cancellable;
@@ -9,10 +10,31 @@ import org.bukkit.event.Cancellable; * @author sk89q
*/
public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
+ private Entity attacker;
+ private int damage;
private boolean cancelled;
- public VehicleDamageEvent(Type type, Vehicle vehicle) {
+ public VehicleDamageEvent(Type type, Vehicle vehicle, Entity attacker, int damage) {
super(type, vehicle);
+ this.attacker = attacker;
+ this.damage = damage;
+ }
+
+ public Entity getAttacker() {
+ return attacker;
+ }
+
+ public int getDamage() {
+ return damage;
+ }
+
+ /**
+ * Change the damage.
+ *
+ * @param damage
+ */
+ public void setDamage(int damage) {
+ this.damage = damage;
}
public boolean isCancelled() {
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleListener.java b/src/main/java/org/bukkit/event/vehicle/VehicleListener.java index 95e6e2df..a285f681 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleListener.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleListener.java @@ -7,11 +7,12 @@ package org.bukkit.event.vehicle; */
public class VehicleListener {
/**
- * Called when a vehicle is placed by a player.
+ * Called when a vehicle is created by a player. This hook will be called
+ * for all vehicles created.
*
* @param event
*/
- public void onVehiclePlace(VehiclePlaceEvent event) {
+ public void onVehicleCreate(VehicleCreateEvent event) {
}
/**
diff --git a/src/main/java/org/bukkit/event/vehicle/VehiclePlaceEvent.java b/src/main/java/org/bukkit/event/vehicle/VehiclePlaceEvent.java deleted file mode 100644 index 44628879..00000000 --- a/src/main/java/org/bukkit/event/vehicle/VehiclePlaceEvent.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.bukkit.event.vehicle;
-
-import org.bukkit.Vehicle;
-import org.bukkit.event.Cancellable;
-
-/**
- * Raised when a vehicle is placed by a player.
- *
- * @author sk89q
- */
-public class VehiclePlaceEvent extends VehicleEvent implements Cancellable {
- private boolean cancelled;
-
- public VehiclePlaceEvent(Type type, Vehicle vehicle) {
- super(type, vehicle);
- }
-
- public boolean isCancelled() {
- return cancelled;
- }
-
- public void setCancelled(boolean cancel) {
- this.cancelled = cancel;
- }
-
-}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 56fcbe79..43647616 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -137,8 +137,8 @@ public final class JavaPluginLoader implements PluginLoader { VehicleListener trueListener = (VehicleListener)listener; switch (event.getType()) { - case VEHICLE_PLACE: - trueListener.onVehiclePlace((VehiclePlaceEvent)event); + case VEHICLE_CREATE: + trueListener.onVehicleCreate((VehicleCreateEvent)event); break; case VEHICLE_DAMAGE: trueListener.onVehicleDamage((VehicleDamageEvent)event); |