3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-23 14:50:08 +01:00

Implemented VEHICLE_UPDATE

Dieser Commit ist enthalten in:
Dinnerbone 2011-02-01 10:20:18 +00:00
Ursprung 2b0ab5a130
Commit 24f140d1f4
2 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -14,6 +14,7 @@ import org.bukkit.event.vehicle.VehicleCreateEvent;
import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.event.vehicle.VehicleDamageEvent;
import org.bukkit.event.vehicle.VehicleEnterEvent; import org.bukkit.event.vehicle.VehicleEnterEvent;
import org.bukkit.event.vehicle.VehicleEntityCollisionEvent; import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
import org.bukkit.event.vehicle.VehicleEvent;
import org.bukkit.event.vehicle.VehicleMoveEvent; import org.bukkit.event.vehicle.VehicleMoveEvent;
// CraftBukkit end // CraftBukkit end
@ -326,9 +327,9 @@ public class EntityBoat extends Entity {
CraftWorld world = ((WorldServer) this.world).getWorld(); CraftWorld world = ((WorldServer) this.world).getWorld();
Location from = new Location(world, prevX, prevY, prevZ, prevYaw, prevPitch); Location from = new Location(world, prevX, prevY, prevZ, prevYaw, prevPitch);
Location to = new Location(world, this.locX, this.locY, this.locZ, this.yaw, this.pitch); Location to = new Location(world, this.locX, this.locY, this.locZ, this.yaw, this.pitch);
if (!from.equals(to)) {
Vehicle vehicle = (Vehicle) this.getBukkitEntity(); Vehicle vehicle = (Vehicle) this.getBukkitEntity();
server.getPluginManager().callEvent(new VehicleEvent(Type.VEHICLE_UPDATE, vehicle));
if (!from.equals(to)) {
VehicleMoveEvent event = new VehicleMoveEvent(Type.VEHICLE_MOVE, vehicle, from, to); VehicleMoveEvent event = new VehicleMoveEvent(Type.VEHICLE_MOVE, vehicle, from, to);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
} }

Datei anzeigen

@ -485,9 +485,9 @@ public class EntityMinecart extends Entity implements IInventory {
CraftWorld world = ((WorldServer) this.world).getWorld(); CraftWorld world = ((WorldServer) this.world).getWorld();
Location from = new Location(world, prevX, prevY, prevZ, prevYaw, prevPitch); Location from = new Location(world, prevX, prevY, prevZ, prevYaw, prevPitch);
Location to = new Location(world, this.locX, this.locY, this.locZ, this.yaw, this.pitch); Location to = new Location(world, this.locX, this.locY, this.locZ, this.yaw, this.pitch);
if (!from.equals(to)) {
Vehicle vehicle = (Vehicle) this.getBukkitEntity(); Vehicle vehicle = (Vehicle) this.getBukkitEntity();
server.getPluginManager().callEvent(new VehicleEvent(Type.VEHICLE_UPDATE, vehicle));
if (!from.equals(to)) {
VehicleMoveEvent event = new VehicleMoveEvent(Type.VEHICLE_MOVE, vehicle, from, to); VehicleMoveEvent event = new VehicleMoveEvent(Type.VEHICLE_MOVE, vehicle, from, to);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
} }