diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
|---|---|---|
| committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
| commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
| tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/EntityEnderPearl.java | |
| parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
| download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip | |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderPearl.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderPearl.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index 63906678..336b6b07 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -40,6 +40,10 @@ public class EntityEnderPearl extends EntityProjectile { Bukkit.getPluginManager().callEvent(teleEvent); if (!teleEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) { + if (this.getShooter().am()) { + this.getShooter().mount((Entity) null); + } + entityplayer.playerConnection.teleport(teleEvent.getTo()); this.getShooter().fallDistance = 0.0F; CraftEventFactory.entityDamage = this; |