1 files changed, 134 insertions, 0 deletions
diff --git a/patches/api/0154-Add-LivingEntity-getTargetEntity.patch b/patches/api/0154-Add-LivingEntity-getTargetEntity.patch
new file mode 100644
index 0000000000..171a95979a
--- /dev/null
+++ b/patches/api/0154-Add-LivingEntity-getTargetEntity.patch
@@ -0,0 +1,134 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Sat, 22 Sep 2018 00:32:53 -0500
+Subject: [PATCH] Add LivingEntity#getTargetEntity
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..af8765b213390cf75fe02a6eb68aecf7a06d5acf
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
+@@ -0,0 +1,40 @@
++package com.destroystokyo.paper.entity;
++
++import org.bukkit.entity.Entity;
++import org.bukkit.util.Vector;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Represents information about a targeted entity
++ * @deprecated use {@link org.bukkit.util.RayTraceResult}
++ */
++@Deprecated(forRemoval = true)
++public class TargetEntityInfo {
++    private final Entity entity;
++    private final Vector hitVec;
++
++    public TargetEntityInfo(@NotNull Entity entity, @NotNull Vector hitVec) {
++        this.entity = entity;
++        this.hitVec = hitVec;
++    }
++
++    /**
++     * Get the entity that is targeted
++     *
++     * @return Targeted entity
++     */
++    @NotNull
++    public Entity getEntity() {
++        return entity;
++    }
++
++    /**
++     * Get the position the entity is targeted at
++     *
++     * @return Targeted position
++     */
++    @NotNull
++    public Vector getHitVector() {
++        return hitVec;
++    }
++}
+diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
+index b41152d81c1ec89a65eaee2a606f4f1b0d421bc7..8cd525dd8ded0ddbd405c66e9c0fbeb40f788521 100644
+--- a/src/main/java/org/bukkit/entity/LivingEntity.java
++++ b/src/main/java/org/bukkit/entity/LivingEntity.java
+@@ -175,6 +175,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+     @Deprecated(forRemoval = true)
+     @Nullable
+     public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
++
++    /**
++     * Gets information about the entity being targeted
++     *
++     * @param maxDistance this is the maximum distance to scan
++     * @return entity being targeted, or null if no entity is targeted
++     */
++    @Nullable
++    public default Entity getTargetEntity(int maxDistance) {
++        return getTargetEntity(maxDistance, false);
++    }
++
++    /**
++     * Gets information about the entity being targeted
++     *
++     * @param maxDistance this is the maximum distance to scan
++     * @param ignoreBlocks true to scan through blocks
++     * @return entity being targeted, or null if no entity is targeted
++     */
++    @Nullable
++    public Entity getTargetEntity(int maxDistance, boolean ignoreBlocks);
++
++    /**
++     * Gets information about the entity being targeted
++     *
++     * @param maxDistance this is the maximum distance to scan
++     * @return TargetEntityInfo about the entity being targeted,
++     *     or null if no entity is targeted
++     * @deprecated use {@link #rayTraceEntities(int)}
++     */
++    @Deprecated(forRemoval = true)
++    @Nullable
++    public default com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance) {
++        return getTargetEntityInfo(maxDistance, false);
++    }
++
++    /**
++     * Gets information about the entity being targeted
++     *
++     * @param maxDistance this is the maximum distance to scan
++     * @return RayTraceResult about the entity being targeted,
++     *     or null if no entity is targeted
++     */
++    @Nullable
++    default RayTraceResult rayTraceEntities(int maxDistance) {
++        return this.rayTraceEntities(maxDistance, false);
++    }
++
++    /**
++     * Gets information about the entity being targeted
++     *
++     * @param maxDistance this is the maximum distance to scan
++     * @param ignoreBlocks true to scan through blocks
++     * @return TargetEntityInfo about the entity being targeted,
++     *     or null if no entity is targeted
++     * @deprecated use {@link #rayTraceEntities(int, boolean)}
++     */
++    @Deprecated(forRemoval = true)
++    @Nullable
++    public com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance, boolean ignoreBlocks);
++
++    /**
++     * Gets information about the entity being targeted
++     *
++     * @param maxDistance this is the maximum distance to scan
++     * @param ignoreBlocks true to scan through blocks
++     * @return RayTraceResult about the entity being targeted,
++     *     or null if no entity is targeted
++     */
++    @Nullable
++    RayTraceResult rayTraceEntities(int maxDistance, boolean ignoreBlocks);
+     // Paper end
+ 
+     /**