aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch')
-rw-r--r--patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch
new file mode 100644
index 0000000000..fac79b2807
--- /dev/null
+++ b/patches/server/0588-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 8c268f57d44d70df3210510abf7832939d41781d..efc27bb4072172f10839c181de9b5fba1f488b6f 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -764,6 +764,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+ }
+
+ protected BlockPos findLightningTargetAround(BlockPos pos) {
++ // Paper start - Add methods to find targets for lightning strikes
++ return this.findLightningTargetAround(pos, false);
++ }
++ public BlockPos findLightningTargetAround(BlockPos pos, boolean returnNullWhenNoTarget) {
++ // Paper end - Add methods to find targets for lightning strikes
+ BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
+ Optional<BlockPos> optional = this.findLightningRod(blockposition1);
+
+@@ -778,6 +783,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 - Add methods to find targets for lightning strikes
+ 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 bcde7c39e0676bf247a825b40b63f6c7b9f19952..7fbf4fba8df8f47b730a46068e68b33502ed63f8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -689,6 +689,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+ return (LightningStrike) lightning.getBukkitEntity();
+ }
+
++ // Paper start - Add methods to find targets for lightning strikes
++ @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 - Add methods to find targets for lightning strikes
++
+ @Override
+ public boolean generateTree(Location loc, TreeType type) {
+ return this.generateTree(loc, CraftWorld.rand, type);