1 files changed, 60 insertions, 0 deletions
diff --git a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
new file mode 100644
index 0000000000..827935032f
--- /dev/null
+++ b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jakub Zacek <[email protected]>
+Date: Mon, 4 Oct 2021 10:16:44 +0200
+Subject: [PATCH] Add methods to find targets for lightning strikes
+
+== AT ==
+public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index eb4ad9cfd2291b01fd09be2114b56502149fe049..9fd3eca485fc71e5da142f8b6763e44691e3f41c 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -976,6 +976,11 @@ 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<BlockPos> optional = this.findLightningRod(blockposition1);
+ 
+@@ -990,6 +995,7 @@ 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 b69c0e32965b3ed5b3e41d7cdee6f07b572d2b7c..bf92ff17e5f084df565b682c8b026dc20f580912 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -699,6 +699,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+         return (LightningStrike) lightning.getBukkitEntity();
+     }
+ 
++    // Paper start
++    @Override
++    public Location findLightningRod(Location location) {
++        return this.world.findLightningRod(io.papermc.paper.util.MCUtil.toBlockPosition(location))
++            .map(blockPos -> io.papermc.paper.util.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(io.papermc.paper.util.MCUtil.toBlockPosition(location), true);
++        return pos == null ? null : io.papermc.paper.util.MCUtil.toLocation(this.world, pos);
++    }
++    // Paper end
++
+     @Override
+     public boolean generateTree(Location loc, TreeType type) {
+         return this.generateTree(loc, CraftWorld.rand, type);