mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-24 05:33:03 +02:00
31699ae9a8
* Updated Upstream (Bukkit/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 Bukkit Changes: a6a9d2a4 Remove some old ApiStatus.Experimental annotations be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration 08f86d1c PR-971: Add Player methods for client-side potion effects 2e3024a9 PR-963: Add API for in-world structures a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality 1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent CraftBukkit Changes: 38fd4bd50 Fix accidentally renamed internal damage method 80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage 7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects 4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration 22a541a29 Improve support for per-world game rules cb7dccce2 PR-1348: Add Player methods for client-side potion effects b8d6109f0 PR-1335: Add API for in-world structures 4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity e74107678 Fix Crafter maximum stack size 0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality 4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason 20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette 3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook 333701839 SPIGOT-7572: Bee nests generated without bees f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
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
|
|
*
|