mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 08:57:35 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
49 lines
2.1 KiB
Diff
49 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 d09c6b7c7b80f1f59e052ddb4aa8ad05b63fca2b..6897600a6879d88cea287cde350c1e9cd11ae96d 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -737,6 +737,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
|
|
*
|