36f34f01c0
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes: 933e9094 #664: Add methods to get/set ItemStacks in EquipmentSlots 18722312 #662: Expose ItemStack and hand used in PlayerShearEntityEvent
105 lines
3.6 KiB
Diff
105 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
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..f52644fab1522bdf83ff4f489e9805b274421094
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
|
|
@@ -0,0 +1,38 @@
|
|
+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
|
|
+ */
|
|
+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 5e9ca6f3d5aac2d119808eb03cfc00367306f5e4..deab505250145e795ef14537c5d453c1703f80aa 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
@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
|
|
+ */
|
|
+ @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
|
|
+ * @param ignoreBlocks true to scan through blocks
|
|
+ * @return TargetEntityInfo about the entity being targeted,
|
|
+ * or null if no entity is targeted
|
|
+ */
|
|
+ @Nullable
|
|
+ public com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance, boolean ignoreBlocks);
|
|
// Paper end
|
|
|
|
/**
|