59 lines
2.9 KiB
Diff
59 lines
2.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Zacek <dawon@dawon.eu>
|
||
|
|
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 6911fbbd3a0b2aed7257e31433fc01fe8fade5ec..96ccf894519fc892e35fbd13ab97fe289236caca 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -956,6 +956,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);
|
||
|
|
|
||
|
|
@@ -970,6 +975,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 8c238a445b327e24d8152b36ebc2b1b57e73d0e1..00d8b61c04ac91770b0ff3b846d3ff70bef2e8e7 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -700,6 +700,23 @@ 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);
|