Some more backwards incompatible changes (minor though), also a ton of small cleanup.
onPluginEnable(PluginEvent event) -> onPluginEnable(PluginEnableEvent event) onPluginDisable(PluginEvent event) -> onPluginDisable(PluginDisableEvent event) onVehicleUpdate(VehicleEvent event) -> onVehicleUpdate(VehicleUpdateEvent event) onWorldSave(WorldEvent event) -> onWorldSave(WorldSaveEvent event) onWorldLoad(WorldEvent event) -> onWorldLoad(WorldLoadEvent event) By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
@@ -11,8 +11,8 @@ import org.bukkit.entity.Vehicle;
|
||||
public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
|
||||
private Block block;
|
||||
|
||||
public VehicleBlockCollisionEvent(Type type, Vehicle vehicle, Block block) {
|
||||
super(type, vehicle);
|
||||
public VehicleBlockCollisionEvent(Vehicle vehicle, Block block) {
|
||||
super(Type.VEHICLE_COLLISION_BLOCK, vehicle);
|
||||
this.block = block;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,7 @@ import org.bukkit.entity.Vehicle;
|
||||
* @author sk89q
|
||||
*/
|
||||
public class VehicleCreateEvent extends VehicleEvent {
|
||||
public VehicleCreateEvent(Type type, Vehicle vehicle) {
|
||||
|
||||
super(type, vehicle);
|
||||
public VehicleCreateEvent(Vehicle vehicle) {
|
||||
super(Type.VEHICLE_CREATE, vehicle);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,8 +14,8 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
|
||||
private int damage;
|
||||
private boolean cancelled;
|
||||
|
||||
public VehicleDamageEvent(Type type, Vehicle vehicle, Entity attacker, int damage) {
|
||||
super(type, vehicle);
|
||||
public VehicleDamageEvent(Vehicle vehicle, Entity attacker, int damage) {
|
||||
super(Type.ENTITY_DAMAGE, vehicle);
|
||||
this.attacker = attacker;
|
||||
this.damage = damage;
|
||||
}
|
||||
|
||||
@@ -12,13 +12,12 @@ import org.bukkit.event.Cancellable;
|
||||
public class VehicleEnterEvent extends VehicleEvent implements Cancellable {
|
||||
private boolean cancelled;
|
||||
private Entity entered;
|
||||
|
||||
public VehicleEnterEvent(Type type, Vehicle vehicle, Entity entered) {
|
||||
super(type, vehicle);
|
||||
|
||||
|
||||
public VehicleEnterEvent(Vehicle vehicle, Entity entered) {
|
||||
super(Type.VEHICLE_ENTER, vehicle);
|
||||
this.entered = entered;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the entity that entered the vehicle.
|
||||
*
|
||||
|
||||
@@ -15,8 +15,8 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
|
||||
private boolean cancelledPickup = false;
|
||||
private boolean cancelledCollision = false;
|
||||
|
||||
public VehicleEntityCollisionEvent(Type type, Vehicle vehicle, Entity entity) {
|
||||
super(type, vehicle);
|
||||
public VehicleEntityCollisionEvent(Vehicle vehicle, Entity entity) {
|
||||
super(Type.VEHICLE_COLLISION_ENTITY, vehicle);
|
||||
this.entity = entity;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,10 +12,9 @@ import org.bukkit.event.Cancellable;
|
||||
public class VehicleExitEvent extends VehicleEvent implements Cancellable {
|
||||
private boolean cancelled;
|
||||
private LivingEntity exited;
|
||||
|
||||
public VehicleExitEvent(Type type, Vehicle vehicle, LivingEntity exited) {
|
||||
super(type, vehicle);
|
||||
|
||||
|
||||
public VehicleExitEvent(Vehicle vehicle, LivingEntity exited) {
|
||||
super(Type.VEHICLE_EXIT, vehicle);
|
||||
this.exited = exited;
|
||||
}
|
||||
|
||||
|
||||
@@ -73,6 +73,6 @@ public class VehicleListener implements Listener {
|
||||
*
|
||||
* @param event
|
||||
*/
|
||||
public void onVehicleUpdate(VehicleEvent event) {
|
||||
public void onVehicleUpdate(VehicleUpdateEvent event) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,11 +11,10 @@ import org.bukkit.entity.Vehicle;
|
||||
public class VehicleMoveEvent extends VehicleEvent {
|
||||
private Location from;
|
||||
private Location to;
|
||||
|
||||
public VehicleMoveEvent(Type type, Vehicle vehicle,
|
||||
Location from, Location to) {
|
||||
super(type, vehicle);
|
||||
|
||||
|
||||
public VehicleMoveEvent(Vehicle vehicle, Location from, Location to) {
|
||||
super(Type.VEHICLE_MOVE, vehicle);
|
||||
|
||||
this.from = from;
|
||||
this.to = to;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package org.bukkit.event.vehicle;
|
||||
|
||||
import org.bukkit.entity.Vehicle;
|
||||
|
||||
public class VehicleUpdateEvent extends VehicleEvent {
|
||||
public VehicleUpdateEvent(Vehicle vehicle) {
|
||||
super(Type.VEHICLE_UPDATE, vehicle);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user