merge upstream

This commit is contained in:
Ben Kerllenevich
2022-06-08 13:50:11 -04:00
parent 6268dc4452
commit 63b5dc886a
12 changed files with 32 additions and 30 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 678dd3f82c3e842450b9d701909bd69298dd8015..e584bcdca9ed8e3ccb3969b45011df3eb7624689 100644
index bf61f916059ea38586ee9ddd9261f71494be8a3f..02adcf7c443536aa067e18c9d4b4253fa192c9b5 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -913,7 +913,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -914,7 +914,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
return holder.is(PoiTypes.LIGHTNING_ROD);
}, (blockposition1) -> {
return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;