diff options
| author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
| commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
| tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/EntityEnderPearl.patch | |
| parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
| download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip | |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/EntityEnderPearl.patch')
| -rw-r--r-- | nms-patches/EntityEnderPearl.patch | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/nms-patches/EntityEnderPearl.patch b/nms-patches/EntityEnderPearl.patch index 760fad24..bc01356d 100644 --- a/nms-patches/EntityEnderPearl.patch +++ b/nms-patches/EntityEnderPearl.patch @@ -11,11 +11,11 @@ + public class EntityEnderPearl extends EntityProjectile { - private EntityLiving c; -@@ -33,21 +39,35 @@ + private EntityLiving d; +@@ -51,13 +57,35 @@ EntityPlayer entityplayer = (EntityPlayer) entityliving; - if (entityplayer.playerConnection.a().g() && entityplayer.world == this.world && !entityplayer.isSleeping()) { + if (entityplayer.playerConnection.a().isConnected() && entityplayer.world == this.world && !entityplayer.isSleeping()) { - if (this.random.nextFloat() < 0.05F && this.world.getGameRules().getBoolean("doMobSpawning")) { - EntityEndermite entityendermite = new EntityEndermite(this.world); - @@ -40,8 +40,8 @@ + this.world.addEntity(entityendermite); + } + -+ if (entityliving.au()) { -+ entityliving.mount((Entity) null); ++ if (entityliving.isPassenger()) { ++ entityliving.stopRiding(); + } + + entityplayer.playerConnection.teleport(teleEvent.getTo()); @@ -50,15 +50,7 @@ + entityliving.damageEntity(DamageSource.FALL, 5.0F); + CraftEventFactory.entityDamage = null; } -- -- if (entityliving.au()) { -- entityliving.mount((Entity) null); -- } -- -- entityliving.enderTeleportTo(this.locX, this.locY, this.locZ); -- entityliving.fallDistance = 0.0F; -- entityliving.damageEntity(DamageSource.FALL, 5.0F); + // CraftBukkit end - } - } else if (entityliving != null) { - entityliving.enderTeleportTo(this.locX, this.locY, this.locZ); + + if (entityliving.isPassenger()) { + this.stopRiding(); |