SPIGOT-2050: Add back code to only fire VehicleEnterEvent for loaded chunks.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-26 09:19:03 +11:00
parent ace6224808
commit 2e5cc5e318

View File

@@ -381,7 +381,7 @@
+ +
+ CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle(); + CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
+ Entity orig = craft == null ? null : craft.getHandle(); + Entity orig = craft == null ? null : craft.getHandle();
+ if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) { + if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
+ VehicleEnterEvent event = new VehicleEnterEvent( + VehicleEnterEvent event = new VehicleEnterEvent(
+ (Vehicle) getBukkitEntity(), + (Vehicle) getBukkitEntity(),
+ entity.getBukkitEntity() + entity.getBukkitEntity()