summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityEnderPearl.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-19 22:03:52 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-20 10:43:00 -0600
commit23b67643741d5754af4de020a29d557078f9f81d (patch)
tree90e1a32f7eb94af49a381cb6bc34bf6247f0efe6 /src/main/java/net/minecraft/server/EntityEnderPearl.java
parent9f1bf124eec7c20f16b2034fd9fba55f70c805fd (diff)
downloadcraftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.gz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.lz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.xz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.zip
Update CraftBukkit to Minecraft 1.4.6
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderPearl.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityEnderPearl.java8
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 e173f625..fa2ccc48 100644
--- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
+++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
@@ -29,7 +29,7 @@ public class EntityEnderPearl extends EntityProjectile {
if (this.getShooter() != null && this.getShooter() instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) this.getShooter();
- if (!entityplayer.netServerHandler.disconnected && entityplayer.world == this.world) {
+ if (!entityplayer.playerConnection.disconnected && 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.netServerHandler.disconnected) {
- entityplayer.netServerHandler.teleport(teleEvent.getTo());
+ if (!teleEvent.isCancelled() && !entityplayer.playerConnection.disconnected) {
+ entityplayer.playerConnection.teleport(teleEvent.getTo());
this.getShooter().fallDistance = 0.0F;
EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(this.getBukkitEntity(), player, EntityDamageByEntityEvent.DamageCause.FALL, 5);
Bukkit.getPluginManager().callEvent(damageEvent);
- if (!damageEvent.isCancelled() && !entityplayer.netServerHandler.disconnected) {
+ if (!damageEvent.isCancelled() && !entityplayer.playerConnection.disconnected) {
entityplayer.invulnerableTicks = -1; // Remove spawning invulnerability
player.setLastDamageCause(damageEvent);
entityplayer.damageEntity(DamageSource.FALL, damageEvent.getDamage());