SPIGOT-4757: Server hangs after teleporting

This commit is contained in:
md_5 2019-04-26 09:45:57 +10:00
parent 3e700e04e9
commit b9a2a74105

View file

@ -426,7 +426,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 && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4)) { + if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
+ VehicleEnterEvent event = new VehicleEnterEvent( + VehicleEnterEvent event = new VehicleEnterEvent(
+ (Vehicle) getBukkitEntity(), + (Vehicle) getBukkitEntity(),
+ entity.getBukkitEntity() + entity.getBukkitEntity()