Paper/nms-patches/EntityEnderPearl.patch
Thinkofdeath 90ac03522a Revert "Remove patch headers"
This reverts commit d6e3dff7d8.
2014-11-28 23:02:15 +00:00

51 lines
2.5 KiB
Diff

--- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderPearl.java 2014-11-28 17:43:43.085707435 +0000
+++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2014-11-28 17:38:24.000000000 +0000
@@ -1,5 +1,11 @@
package net.minecraft.server;
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.player.PlayerTeleportEvent;
+// CraftBukkit end
+
public class EntityEnderPearl extends EntityProjectile {
public EntityEnderPearl(World world, EntityLiving entityliving) {
@@ -29,14 +35,28 @@
entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
this.world.addEntity(entityendermite);
}
-
- if (entityliving.av()) {
- entityliving.mount((Entity) null);
+
+ // CraftBukkit start - Fire PlayerTeleportEvent
+ org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity();
+ org.bukkit.Location location = getBukkitEntity().getLocation();
+ location.setPitch(player.getLocation().getPitch());
+ location.setYaw(player.getLocation().getYaw());
+
+ PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), location, PlayerTeleportEvent.TeleportCause.ENDER_PEARL);
+ Bukkit.getPluginManager().callEvent(teleEvent);
+
+ if (!teleEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) {
+ if (entityliving.av()) {
+ entityliving.mount((Entity) null);
+ }
+
+ entityplayer.playerConnection.teleport(teleEvent.getTo());
+ entityliving.fallDistance = 0.0F;
+ CraftEventFactory.entityDamage = this;
+ entityliving.damageEntity(DamageSource.FALL, 5.0F);
+ CraftEventFactory.entityDamage = null;
}
-
- entityliving.enderTeleportTo(this.locX, this.locY, this.locZ);
- entityliving.fallDistance = 0.0F;
- entityliving.damageEntity(DamageSource.FALL, 5.0F);
+ // CraftBukkit end
}
}