From 2aa5ac6c92a0e53ae917cae348d662d014ef9366 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 15 Mar 2017 20:48:47 +1100 Subject: SPIGOT-3128: Shift VehicleCreateEvent calling. --- .../bukkit/craftbukkit/event/CraftEventFactory.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index a6c15283..ad383ffe 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -63,6 +63,8 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.entity.AbstractHorse; +import org.bukkit.entity.Vehicle; +import org.bukkit.event.vehicle.VehicleCreateEvent; public class CraftEventFactory { public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.BURN); @@ -1015,11 +1017,18 @@ public class CraftEventFactory { return event; } - public static AreaEffectCloudApplyEvent callAreaEffectCloudApplyEvent(EntityAreaEffectCloud cloud, List entities) { - AreaEffectCloudApplyEvent event = new AreaEffectCloudApplyEvent((AreaEffectCloud) cloud.getBukkitEntity(), entities); - cloud.world.getServer().getPluginManager().callEvent(event); - return event; - } + public static AreaEffectCloudApplyEvent callAreaEffectCloudApplyEvent(EntityAreaEffectCloud cloud, List entities) { + AreaEffectCloudApplyEvent event = new AreaEffectCloudApplyEvent((AreaEffectCloud) cloud.getBukkitEntity(), entities); + cloud.world.getServer().getPluginManager().callEvent(event); + return event; + } + + public static VehicleCreateEvent callVehicleCreateEvent(Entity entity) { + Vehicle bukkitEntity = (Vehicle) entity.getBukkitEntity(); + VehicleCreateEvent event = new VehicleCreateEvent(bukkitEntity); + Bukkit.getPluginManager().callEvent(event); + return event; + } public static EntityBreedEvent callEntityBreedEvent(EntityLiving child, EntityLiving mother, EntityLiving father, EntityLiving breeder, ItemStack bredWith, int experience) { org.bukkit.entity.LivingEntity breederEntity = (LivingEntity)(breeder == null ? null : breeder.getBukkitEntity()); -- cgit v1.2.3