Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-06-26 06:44:49 +02:00
Code Issues Projects Releases Wiki Activity

Add Structure check API (#9062)

Browse Source
This commit is contained in:
Jake Potrebic 2023-12-02 18:11:57 -08:00 committed by GitHub
parent 5cbd5352b4
commit 8e061ce9c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
patches/api/0450-Add-Structure-check-API.patch Normal file
View File

@ -0,0 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 27 Mar 2023 10:20:06 -0700
Subject: [PATCH] Add Structure check API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index f72f0f0f8eee95f95adc969d55ba7de82ee30e2a..567a36a4887da8994c9170e2885aa8cc357efa0c 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -76,6 +76,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
*/
int getPlayerCount();
// Paper end
+ // Paper start - structure check API
+ /**
+ * Check if the naturally-generated structure exists at the position.
+ * <p>
+ * Note that if the position is not loaded, this may cause chunk loads/generation
+ * to check if a structure is at that position. Use {@link #isPositionLoaded(io.papermc.paper.math.Position)}
+ * to check if a position is loaded
+ *
+ * @param position the position to check at
+ * @param structure the structure to check for
+ * @return true if that structure exists at the position
+ */
+ boolean hasStructureAt(io.papermc.paper.math.@NotNull Position position, @NotNull Structure structure);
+
+ /**
+ * Checks if this position is loaded.
+ *
+ * @param position position to check
+ * @return true if loaded
+ */
+ default boolean isPositionLoaded(io.papermc.paper.math.@NotNull Position position) {
+ return this.isChunkLoaded(position.blockX() >> 4, position.blockZ() >> 4);
+ }
+ // Paper end
/**
* Gets the {@link Block} at the given coordinates

23
patches/server/1057-Add-Structure-check-API.patch Normal file
View File

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 27 Mar 2023 10:20:00 -0700
Subject: [PATCH] Add Structure check API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f19f2199cac5a7eb275f40cc23472416a40ec0da..90c76ddcb8af13409490b8976263d27a71954668 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -230,6 +230,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
};
}
// Paper end
+ // Paper start - structure check API
+ @Override
+ public boolean hasStructureAt(final io.papermc.paper.math.Position position, final Structure structure) {
+ return this.world.structureManager().getStructureWithPieceAt(io.papermc.paper.util.MCUtil.toBlockPos(position), net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.STRUCTURE, CraftNamespacedKey.toMinecraft(structure.getKey()))).isValid();
+ }
+ // Paper end
private static final Random rand = new Random();