Fixed EnderPearls not being limited to the world they were used in. Fixes BUKKIT-658

This commit is contained in:
EvilSeph 2012-03-08 19:24:43 -05:00
parent 8ecdfe9eed
commit f26fbc3bf3

View File

@ -36,7 +36,7 @@ public class EntityEnderPearl extends EntityProjectile {
if (this.shooter != null) { if (this.shooter != null) {
if (this.shooter instanceof EntityPlayer) { if (this.shooter instanceof EntityPlayer) {
CraftPlayer player = (CraftPlayer) this.shooter.bukkitEntity; CraftPlayer player = (CraftPlayer) this.shooter.bukkitEntity;
teleport = player.isOnline(); teleport = player.isOnline() && player.getWorld() == getBukkitEntity().getWorld();
if (teleport) { if (teleport) {
teleEvent = new PlayerTeleportEvent(player, player.getLocation(), getBukkitEntity().getLocation(), PlayerTeleportEvent.TeleportCause.ENDER_PEARL); teleEvent = new PlayerTeleportEvent(player, player.getLocation(), getBukkitEntity().getLocation(), PlayerTeleportEvent.TeleportCause.ENDER_PEARL);