26734e83b0
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 8085edde SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 04c7e13c PR-719: Add Player Profile API 71564210 SPIGOT-6910: Add BlockDamageAbortEvent CraftBukkit Changes: febaa1c6 SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 9dafd109 Don't send updates over large distances bdac46b0 SPIGOT-6782: EntityPortalEvent should not destroy entity when setTo() uses same world as getFrom() 8f361ece PR-1002: Add Player Profile API 911875d4 Increase outdated build delay e5f8a767 SPIGOT-6917: Use main scoreboard for /trigger a672a531 Clean up callBlockDamageEvent 8e1bdeef SPIGOT-6910: Add BlockDamageAbortEvent Spigot Changes: 6edb62f3 Rebuild patches 7fbc6a1e Rebuild patches * Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: de951355 SPIGOT-6927: Fix default value of spawn-limits in Worlds
49 Zeilen
2.1 KiB
Diff
49 Zeilen
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 fa2720db5fdb67da1fe6c47c4875037d929d9aec..6e150341dbb4439a186f55d6bb537b46bee74e89 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -758,6 +758,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
|
|
*
|