Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 19:07:40 +01:00
Code Issues Projects Releases Wiki Activity

Extend VehicleCollisionEvent, move HandlerList up

Browse Source 
Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
This commit is contained in:
Jake Potrebic 2021-12-13 14:35:27 -08:00
parent a3eeb99eea
commit 546372966a
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
View File

@ -9,14 +9,32 @@ import org.jetbrains.annotations.NotNull;
* Raised when a vehicle collides with a block.
*/
public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
private static final HandlerList handlers = new HandlerList();
private final Block block;
private final org.bukkit.util.Vector velocity; // Paper
// Paper start - Add pre-collision velocity
@Deprecated
public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
this(vehicle, block, vehicle.getVelocity());
}
public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block, @NotNull final org.bukkit.util.Vector velocity) { // Paper - Added velocity
super(vehicle);
this.block = block;
this.velocity = velocity;
}
/**
* Gets velocity at which the vehicle collided with the block
*
* @return pre-collision moving velocity
*/
@NotNull
public org.bukkit.util.Vector getVelocity() {
return velocity;
}
// Paper end
/**
* Gets the block the vehicle collided with
*
@ -26,15 +44,4 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
public Block getBlock() {
return block;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlers;
}
@NotNull
public static HandlerList getHandlerList() {
return handlers;
}
}

11
paper-api/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
View File

@ -7,7 +7,18 @@ import org.jetbrains.annotations.NotNull;
* Raised when a vehicle collides.
*/
public abstract class VehicleCollisionEvent extends VehicleEvent {
private static final org.bukkit.event.HandlerList HANDLER_LIST = new org.bukkit.event.HandlerList(); // Paper
public VehicleCollisionEvent(@NotNull final Vehicle vehicle) {
super(vehicle);
}
// Paper start
@Override
public org.bukkit.event.@org.jetbrains.annotations.NotNull HandlerList getHandlers() {
return HANDLER_LIST;
}
public static org.bukkit.event.@NotNull HandlerList getHandlerList() {
return HANDLER_LIST;
}
// Paper end
}

12
paper-api/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
View File

@ -10,7 +10,6 @@ import org.jetbrains.annotations.NotNull;
* Raised when a vehicle collides with an entity.
*/
public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private final Entity entity;
private boolean cancelled = false;
private boolean cancelledPickup = false;
@ -55,15 +54,4 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
public void setCollisionCancelled(boolean cancel) {
cancelledCollision = cancel;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlers;
}
@NotNull
public static HandlerList getHandlerList() {
return handlers;
}
}