diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderPearl.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderPearl.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 585154e4..3a602af0 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -18,7 +18,7 @@ public class EntityEnderPearl extends EntityProjectile { protected void a(MovingObjectPosition movingobjectposition) { if (movingobjectposition.entity != null) { - movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.getShooter()), 0); + movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.getShooter()), 0.0F); } for (int i = 0; i < 32; ++i) { @@ -29,7 +29,7 @@ public class EntityEnderPearl extends EntityProjectile { if (this.getShooter() != null && this.getShooter() instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) this.getShooter(); - if (!entityplayer.playerConnection.disconnected && entityplayer.world == this.world) { + if (entityplayer.playerConnection.b().d() && entityplayer.world == this.world) { // CraftBukkit start org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity(); org.bukkit.Location location = getBukkitEntity().getLocation(); @@ -39,14 +39,14 @@ public class EntityEnderPearl extends EntityProjectile { PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), location, PlayerTeleportEvent.TeleportCause.ENDER_PEARL); Bukkit.getPluginManager().callEvent(teleEvent); - if (!teleEvent.isCancelled() && !entityplayer.playerConnection.disconnected) { + if (!teleEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) { entityplayer.playerConnection.teleport(teleEvent.getTo()); this.getShooter().fallDistance = 0.0F; EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(this.getBukkitEntity(), player, EntityDamageByEntityEvent.DamageCause.FALL, 5.0D); Bukkit.getPluginManager().callEvent(damageEvent); - if (!damageEvent.isCancelled() && !entityplayer.playerConnection.disconnected) { + if (!damageEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) { entityplayer.invulnerableTicks = -1; // Remove spawning invulnerability player.setLastDamageCause(damageEvent); entityplayer.damageEntity(DamageSource.FALL, (float) damageEvent.getDamage()); |