diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
| commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
| tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/EntityEnderPearl.patch | |
| parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
| download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip | |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/EntityEnderPearl.patch')
| -rw-r--r-- | nms-patches/EntityEnderPearl.patch | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/nms-patches/EntityEnderPearl.patch b/nms-patches/EntityEnderPearl.patch index 1eeddb3a..645715b8 100644 --- a/nms-patches/EntityEnderPearl.patch +++ b/nms-patches/EntityEnderPearl.patch @@ -1,6 +1,6 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/EntityEnderPearl.java 2015-01-05 10:11:38.333916086 +1100 -+++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2015-01-05 10:11:38.333916086 +1100 -@@ -1,7 +1,20 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/EntityEnderPearl.java 2015-02-26 22:40:22.523608140 +0000 ++++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2015-02-26 22:40:22.523608140 +0000 +@@ -1,5 +1,11 @@ package net.minecraft.server; +// CraftBukkit start @@ -11,24 +11,13 @@ + public class EntityEnderPearl extends EntityProjectile { -+ // CraftBukkit start -+ // This is backported from 1.8.1 -+ public EntityEnderPearl(World world) { -+ super(world); -+ } -+ // CraftBukkit end -+ - public EntityEnderPearl(World world, EntityLiving entityliving) { - super(world, entityliving); - } -@@ -29,14 +42,28 @@ - entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch); + private EntityLiving c; +@@ -41,13 +47,27 @@ this.world.addEntity(entityendermite); } -- -- if (entityliving.av()) { + +- if (entityliving.au()) { - entityliving.mount((Entity) null); -+ + // CraftBukkit start - Fire PlayerTeleportEvent + org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity(); + org.bukkit.Location location = getBukkitEntity().getLocation(); @@ -39,7 +28,7 @@ + Bukkit.getPluginManager().callEvent(teleEvent); + + if (!teleEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) { -+ if (entityliving.av()) { ++ if (entityliving.au()) { + entityliving.mount((Entity) null); + } + @@ -55,5 +44,5 @@ - entityliving.damageEntity(DamageSource.FALL, 5.0F); + // CraftBukkit end } - } - + } else if (entityliving != null) { + entityliving.enderTeleportTo(this.locX, this.locY, this.locZ); |