summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-03-15 20:48:47 +1100
committermd_5 <git@md-5.net>2017-03-15 20:48:47 +1100
commit2aa5ac6c92a0e53ae917cae348d662d014ef9366 (patch)
treeef8c8aff58994d9a2c187864496c7c5689260737 /src/main
parent251e4c9215141e01df87308c2faec3bf2e1e9460 (diff)
downloadcraftbukkit-2aa5ac6c92a0e53ae917cae348d662d014ef9366.tar
craftbukkit-2aa5ac6c92a0e53ae917cae348d662d014ef9366.tar.gz
craftbukkit-2aa5ac6c92a0e53ae917cae348d662d014ef9366.tar.lz
craftbukkit-2aa5ac6c92a0e53ae917cae348d662d014ef9366.tar.xz
craftbukkit-2aa5ac6c92a0e53ae917cae348d662d014ef9366.zip
SPIGOT-3128: Shift VehicleCreateEvent calling.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java19
1 files changed, 14 insertions, 5 deletions
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<LivingEntity> entities) {
- AreaEffectCloudApplyEvent event = new AreaEffectCloudApplyEvent((AreaEffectCloud) cloud.getBukkitEntity(), entities);
- cloud.world.getServer().getPluginManager().callEvent(event);
- return event;
- }
+ public static AreaEffectCloudApplyEvent callAreaEffectCloudApplyEvent(EntityAreaEffectCloud cloud, List<LivingEntity> 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());