diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2016-03-02 16:48:00 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2016-03-02 16:48:00 +0000 |
| commit | 6f032cdc8ab6bc4eeefeecd3fde8ba8fbde18f0f (patch) | |
| tree | eef4c15696fbe2e05d5137a81d6f9e08dfa63a6a /nms-patches | |
| parent | 3f534696a32d56b08a882b0c443411ec5ae6efdd (diff) | |
| download | craftbukkit-6f032cdc8ab6bc4eeefeecd3fde8ba8fbde18f0f.tar craftbukkit-6f032cdc8ab6bc4eeefeecd3fde8ba8fbde18f0f.tar.gz craftbukkit-6f032cdc8ab6bc4eeefeecd3fde8ba8fbde18f0f.tar.lz craftbukkit-6f032cdc8ab6bc4eeefeecd3fde8ba8fbde18f0f.tar.xz craftbukkit-6f032cdc8ab6bc4eeefeecd3fde8ba8fbde18f0f.zip | |
Fix a mistake in EntityEnderPearl causing a double teleport
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityEnderPearl.patch | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nms-patches/EntityEnderPearl.patch b/nms-patches/EntityEnderPearl.patch index bc01356d..7e5dfe53 100644 --- a/nms-patches/EntityEnderPearl.patch +++ b/nms-patches/EntityEnderPearl.patch @@ -12,7 +12,7 @@ public class EntityEnderPearl extends EntityProjectile { private EntityLiving d; -@@ -51,13 +57,35 @@ +@@ -51,21 +57,35 @@ EntityPlayer entityplayer = (EntityPlayer) entityliving; if (entityplayer.playerConnection.a().isConnected() && entityplayer.world == this.world && !entityplayer.isSleeping()) { @@ -50,7 +50,15 @@ + entityliving.damageEntity(DamageSource.FALL, 5.0F); + CraftEventFactory.entityDamage = null; } +- +- if (entityliving.isPassenger()) { +- this.stopRiding(); +- } +- +- entityliving.enderTeleportTo(this.locX, this.locY, this.locZ); +- entityliving.fallDistance = 0.0F; +- entityliving.damageEntity(DamageSource.FALL, 5.0F); + // CraftBukkit end - - if (entityliving.isPassenger()) { - this.stopRiding(); + } + } else if (entityliving != null) { + entityliving.enderTeleportTo(this.locX, this.locY, this.locZ); |