From 61ec751ca11f5bff9ec2dd1644982d5628270004 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Sat, 14 Jan 2012 21:03:48 +0100 Subject: Update for 1.1_01 renames. We know these updates (can) break plugins bypassing Bukkit. They are needed for smooth updates however. There will be another one right before before 1.1-R1. --- src/main/java/net/minecraft/server/EntityEnderPearl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntityEnderPearl.java') diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 8cd483d1..210ef66b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -52,7 +52,7 @@ public class EntityEnderPearl extends EntityProjectile { if (this.shooter instanceof EntityPlayer) { ((EntityPlayer)this.shooter).netServerHandler.teleport(teleEvent.getTo()); } else { - this.shooter.a_(this.locX, this.locY, this.locZ); + this.shooter.enderTeleportTo(this.locX, this.locY, this.locZ); } this.shooter.fallDistance = 0.0F; EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(this.getBukkitEntity(), this.shooter.getBukkitEntity(), EntityDamageByEntityEvent.DamageCause.FALL, 5); @@ -60,7 +60,7 @@ public class EntityEnderPearl extends EntityProjectile { if (!damageEvent.isCancelled()) { org.bukkit.entity.Player bPlayer = Bukkit.getPlayerExact(((EntityPlayer) this.shooter).name); - ((CraftPlayer) bPlayer).getHandle().cj = -1; // Remove spawning invulnerability. + ((CraftPlayer) bPlayer).getHandle().invulnerableTicks = -1; // Remove spawning invulnerability. ((CraftPlayer) bPlayer).getHandle().damageEntity(DamageSource.FALL, 5); // Damage the new player instead of the old } } -- cgit v1.2.3