summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityEnderPearl.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-14 21:03:48 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-15 10:52:37 +0100
commit61ec751ca11f5bff9ec2dd1644982d5628270004 (patch)
tree8829269e1c5807b55566d367bec5ee630d5dfb1d /src/main/java/net/minecraft/server/EntityEnderPearl.java
parent6495eee0c9fddcce2c2aa9bf9c45118abea180c1 (diff)
downloadcraftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.gz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.lz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.xz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.zip
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.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderPearl.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityEnderPearl.java4
1 files changed, 2 insertions, 2 deletions
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
}
}