From 2708960eba1e4f6b0a1dc299ed4e95c3defc294d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1=C4=8Dek?= Date: Fri, 8 Oct 2021 12:00:03 +0200 Subject: [PATCH] Add methods to find targets for lightning strikes (#6712) --- build-data/paper.at | 3 + ...o-find-targets-for-lightning-strikes.patch | 48 +++++++++++++++ ...o-find-targets-for-lightning-strikes.patch | 58 +++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch create mode 100644 patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/build-data/paper.at b/build-data/paper.at index 38986ed82d..4820db9d3f 100644 --- a/build-data/paper.at +++ b/build-data/paper.at @@ -241,3 +241,6 @@ public net.minecraft.world.entity.projectile.Projectile ownerUUID public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations toBukkitSlot(I)Lorg/bukkit/scoreboard/DisplaySlot; public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations fromBukkitSlot(Lorg/bukkit/scoreboard/DisplaySlot;)I + +# Add methods to find targets for lightning strikes +public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; diff --git a/patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch new file mode 100644 index 0000000000..0de797361e --- /dev/null +++ b/patches/api/Add-methods-to-find-targets-for-lightning-strikes.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jakub Zacek +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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -0,0 +0,0 @@ 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. ++ * ++ *

Note: To activate a Lightning Rod, the position one block above it must be struck by lightning.

++ * ++ * @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. ++ *

It selects from (in the following order):

++ *
    ++ *
  1. the block above the nearest Lightning Rod, found using {@link World#findLightningRod(Location)}
    2. ++ *
  2. a random {@link LivingEntity} that can see the sky in a 6x6 cuboid ++ * around input X/Z coordinates. Y ranges from the highest motion-blocking ++ * block at the input X/Z - 3 to the height limit + 3
    3. ++ *
++ *

Returns {@code null} if no target is found.

++ * ++ * @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 + * diff --git a/patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch new file mode 100644 index 0000000000..1cff673c74 --- /dev/null +++ b/patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jakub Zacek +Date: Mon, 4 Oct 2021 10:16:44 +0200 +Subject: [PATCH] Add methods to find targets for lightning strikes + + +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { + } + + protected BlockPos findLightningTargetAround(BlockPos pos) { ++ // Paper start ++ return this.findLightningTargetAround(pos, false); ++ } ++ public BlockPos findLightningTargetAround(BlockPos pos, boolean returnNullWhenNoTarget) { ++ // Paper end + BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos); + Optional optional = this.findLightningRod(blockposition1); + +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { + if (!list.isEmpty()) { + return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition(); + } else { ++ if (returnNullWhenNoTarget) return null; // Paper + if (blockposition1.getY() == this.getMinBuildHeight() - 1) { + blockposition1 = blockposition1.above(2); + } +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World { + return (LightningStrike) lightning.getBukkitEntity(); + } + ++ // Paper start ++ @Override ++ public Location findLightningRod(Location location) { ++ return this.world.findLightningRod(net.minecraft.server.MCUtil.toBlockPosition(location)) ++ .map(blockPos -> net.minecraft.server.MCUtil.toLocation(this.world, blockPos) ++ // get the actual rod pos ++ .subtract(0, 1, 0)) ++ .orElse(null); ++ } ++ ++ @Override ++ public Location findLightningTarget(Location location) { ++ final BlockPos pos = this.world.findLightningTargetAround(net.minecraft.server.MCUtil.toBlockPosition(location), true); ++ return pos == null ? null : net.minecraft.server.MCUtil.toLocation(this.world, pos); ++ } ++ // Paper end ++ + @Override + public boolean generateTree(Location loc, TreeType type) { + return generateTree(loc, CraftWorld.rand, type);