mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
c50fc3a026
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: 8d818032 PR-723: Add Furnace#getRecipesUsed d7b5a313 PR-726: Add Particle dataTypes to javadocs 72fe8b71 PR-724: Add PDC to World CraftBukkit Changes: c0326c28 PR-1009: Add Furnace#getRecipesUsed cc5ddd79 PR-1010: Add PDC to World 6a54e5d3 PR-1012: Always save as skull owner and not as internal data Spigot Changes: 699290cd Rebuild patches
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jakub Zacek <dawon@dawon.eu>
|
|
Date: Mon, 4 Oct 2021 08:29:36 +0200
|
|
Subject: [PATCH] Add methods to find targets for lightning strikes
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index abce27d50ef62f14948220272a2452874ae69836..268d77210e47d5247ac9b82c344fac323b16a0c4 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -759,6 +759,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
@NotNull
|
|
public LightningStrike strikeLightningEffect(@NotNull Location loc);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Finds the location of the nearest unobstructed Lightning Rod in a 128-block
|
|
+ * radius around the given location. Returns {@code null} if no Lightning Rod is found.
|
|
+ *
|
|
+ * <p>Note: To activate a Lightning Rod, the position one block above it must be struck by lightning.</p>
|
|
+ *
|
|
+ * @param location {@link Location} to search for Lightning Rod around
|
|
+ * @return {@link Location} of Lightning Rod or {@code null}
|
|
+ */
|
|
+ @Nullable
|
|
+ public Location findLightningRod(@NotNull Location location);
|
|
+
|
|
+ /**
|
|
+ * Finds a target {@link Location} for lightning to strike.
|
|
+ * <p>It selects from (in the following order):</p>
|
|
+ * <ol>
|
|
+ * <li>the block above the nearest Lightning Rod, found using {@link World#findLightningRod(Location)}</li>
|
|
+ * <li>a random {@link LivingEntity} that can see the sky in a 6x6 cuboid
|
|
+ * around input X/Z coordinates. Y ranges from <i>the highest motion-blocking
|
|
+ * block at the input X/Z - 3</i> to <i>the height limit + 3</i></li>
|
|
+ * </ol>
|
|
+ * <p>Returns {@code null} if no target is found.</p>
|
|
+ *
|
|
+ * @param location {@link Location} to search for target around
|
|
+ * @return lightning target or {@code null}
|
|
+ */
|
|
+ @Nullable
|
|
+ public Location findLightningTarget(@NotNull Location location);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Get a list of all entities in this World
|
|
*
|