mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix structure check API (#11307)

Browse source 
* Fix structure check API

* Use CraftStructure#bukkitToMinecraft

* Fixed spelling mistake on CraftStructure class name
This commit is contained in:
roro1506HD 2024-08-21 03:27:33 +02:00 • committed by GitHub
parent 32711191cd
commit 2fdb2e9dcd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
patches/server/0913-Add-Structure-check-API.patch
View file

@ -5,24 +5,19 @@ 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 612dc787880e58e8325a658a63f9fe7536d0860c..ebb119ab9f5a8ae580e54cb3c102cd86f948a8d2 100644
index 612dc787880e58e8325a658a63f9fe7536d0860c..7d54a29047d210170edf61c6182a6a8d02aa5f72 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -236,6 +236,20 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -236,6 +236,15 @@ 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) {
+ net.minecraft.world.level.levelgen.structure.Structure vanillaStructure = this.world.registryAccess()
+ .registryOrThrow(net.minecraft.core.registries.Registries.STRUCTURE)
+ .getHolder(CraftNamespacedKey.toMinecraft(structure.getStructureType().getKey()))
+ .orElseThrow()
+ .value();
+ return this.world.structureManager().getStructureWithPieceAt(
+ io.papermc.paper.util.MCUtil.toBlockPos(position),
+ vanillaStructure
+ CraftStructure.bukkitToMinecraft(structure)
+ ).isValid();
+ }
+ // Paper end