mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 21:47:55 +01:00
928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TwoLeggedCat <80929284+TwoLeggedCat@users.noreply.github.com>
|
|
Date: Sat, 29 May 2021 14:33:18 -0500
|
|
Subject: [PATCH] Add more line of sight methods
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
|
|
index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdfadaf40f6 100644
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
|
@@ -392,5 +392,13 @@ public interface RegionAccessor extends Keyed { // Paper
|
|
@NotNull
|
|
@Override
|
|
NamespacedKey getKey();
|
|
+
|
|
+ /**
|
|
+ * Tell whether a line of sight exists between the given locations
|
|
+ * @param from Location to start at
|
|
+ * @param to target Location
|
|
+ * @return whether a line of sight exists between {@code from} and {@code to}
|
|
+ */
|
|
+ public boolean lineOfSightExists(@NotNull Location from, @NotNull Location to);
|
|
// Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index a6c0b5e55adadd78619d251d979e9e46068a637e..d47706a915ae1bfaa3187a83cb6d35ea202c03d0 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -484,6 +484,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
public boolean hasLineOfSight(@NotNull Entity other);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Checks whether the living entity has block line of sight to the given block.
|
|
+ * <p>
|
|
+ * This uses the same algorithm that hostile mobs use to find the closest
|
|
+ * player.
|
|
+ *
|
|
+ * @param location the location to determine line of sight to
|
|
+ * @return true if there is a line of sight, false if not
|
|
+ */
|
|
+ public boolean hasLineOfSight(@NotNull Location location);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Returns if the living entity despawns when away from players or not.
|
|
* <p>
|