From 56813c7ffff77070a90c6520ee60519d2e444788 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 1 Jul 2016 12:30:28 +1000 Subject: SPIGOT-1468: ENDER_PEARL SpawnReason --- nms-patches/EntityEnderPearl.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'nms-patches') diff --git a/nms-patches/EntityEnderPearl.patch b/nms-patches/EntityEnderPearl.patch index 62cc9bf6..d175b03e 100644 --- a/nms-patches/EntityEnderPearl.patch +++ b/nms-patches/EntityEnderPearl.patch @@ -1,18 +1,19 @@ --- a/net/minecraft/server/EntityEnderPearl.java +++ b/net/minecraft/server/EntityEnderPearl.java -@@ -1,5 +1,11 @@ +@@ -1,5 +1,12 @@ package net.minecraft.server; +// CraftBukkit start +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.event.CraftEventFactory; ++import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +// CraftBukkit end + public class EntityEnderPearl extends EntityProjectile { private EntityLiving d; -@@ -55,21 +61,35 @@ +@@ -55,21 +62,35 @@ EntityPlayer entityplayer = (EntityPlayer) entityliving; if (entityplayer.playerConnection.a().isConnected() && entityplayer.world == this.world && !entityplayer.isSleeping()) { @@ -37,7 +38,7 @@ + + entityendermite.a(true); + entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch); -+ this.world.addEntity(entityendermite); ++ this.world.addEntity(entityendermite, CreatureSpawnEvent.SpawnReason.ENDER_PEARL); + } + + if (entityliving.isPassenger()) { -- cgit v1.2.3