[Bleeding] Changed event system into a new, much faster design. Huge thanks to @zml2008 & @lahwran.
By: Nathan Adams <dinnerbone@dinnerbone.com>
This commit is contained in:
@@ -2,12 +2,14 @@ package org.bukkit.event.vehicle;
|
||||
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a vehicle collides with a block.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private Block block;
|
||||
|
||||
public VehicleBlockCollisionEvent(Vehicle vehicle, Block block) {
|
||||
@@ -23,4 +25,13 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
|
||||
public Block getBlock() {
|
||||
return block;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import org.bukkit.entity.Vehicle;
|
||||
* Raised when a vehicle collides.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleCollisionEvent extends VehicleEvent {
|
||||
public abstract class VehicleCollisionEvent extends VehicleEvent {
|
||||
public VehicleCollisionEvent(Type type, Vehicle vehicle) {
|
||||
super(type, vehicle);
|
||||
}
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
package org.bukkit.event.vehicle;
|
||||
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a vehicle is created.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleCreateEvent extends VehicleEvent {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
public VehicleCreateEvent(Vehicle vehicle) {
|
||||
super(Type.VEHICLE_CREATE, vehicle);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,14 @@ package org.bukkit.event.vehicle;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.Cancellable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a vehicle receives damage.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private Entity attacker;
|
||||
private int damage;
|
||||
private boolean cancelled;
|
||||
@@ -53,4 +55,13 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
|
||||
public void setCancelled(boolean cancel) {
|
||||
this.cancelled = cancel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package org.bukkit.event.vehicle;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.Cancellable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a vehicle is destroyed, which could be caused by either a player
|
||||
@@ -11,6 +12,7 @@ import org.bukkit.event.Cancellable;
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleDestroyEvent extends VehicleEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private Entity attacker;
|
||||
private boolean cancelled;
|
||||
|
||||
@@ -35,4 +37,13 @@ public class VehicleDestroyEvent extends VehicleEvent implements Cancellable {
|
||||
public void setCancelled(boolean cancel) {
|
||||
this.cancelled = cancel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,14 @@ package org.bukkit.event.vehicle;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.Cancellable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when an entity enters a vehicle.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleEnterEvent extends VehicleEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private boolean cancelled;
|
||||
private Entity entered;
|
||||
|
||||
@@ -33,4 +35,13 @@ public class VehicleEnterEvent extends VehicleEvent implements Cancellable {
|
||||
public void setCancelled(boolean cancel) {
|
||||
this.cancelled = cancel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,14 @@ package org.bukkit.event.vehicle;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.Cancellable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a vehicle collides with an entity.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private Entity entity;
|
||||
private boolean cancelled = false;
|
||||
private boolean cancelledPickup = false;
|
||||
@@ -46,4 +48,13 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
|
||||
public void setCollisionCancelled(boolean cancel) {
|
||||
cancelledCollision = cancel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import org.bukkit.event.Event;
|
||||
* Represents a vehicle-related event.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleEvent extends Event {
|
||||
public abstract class VehicleEvent extends Event {
|
||||
protected Vehicle vehicle;
|
||||
|
||||
public VehicleEvent(final Event.Type type, final Vehicle vehicle) {
|
||||
|
||||
@@ -3,12 +3,14 @@ package org.bukkit.event.vehicle;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.Cancellable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a living entity exits a vehicle.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleExitEvent extends VehicleEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private boolean cancelled;
|
||||
private LivingEntity exited;
|
||||
|
||||
@@ -33,4 +35,13 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
|
||||
public void setCancelled(boolean cancel) {
|
||||
this.cancelled = cancel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import org.bukkit.event.Listener;
|
||||
/**
|
||||
* Listener for vehicle events.
|
||||
*/
|
||||
@Deprecated
|
||||
public class VehicleListener implements Listener {
|
||||
public VehicleListener() {}
|
||||
|
||||
|
||||
@@ -2,12 +2,14 @@ package org.bukkit.event.vehicle;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
/**
|
||||
* Raised when a vehicle moves.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleMoveEvent extends VehicleEvent {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private Location from;
|
||||
private Location to;
|
||||
|
||||
@@ -35,4 +37,14 @@ public class VehicleMoveEvent extends VehicleEvent {
|
||||
public Location getTo() {
|
||||
return to;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,21 @@
|
||||
package org.bukkit.event.vehicle;
|
||||
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class VehicleUpdateEvent extends VehicleEvent {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
public VehicleUpdateEvent(Vehicle vehicle) {
|
||||
super(Type.VEHICLE_UPDATE, vehicle);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user