geforkt von Mirrors/Paper
f17519338b
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
33 Zeilen
1.6 KiB
Diff
33 Zeilen
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TrollyLoki <trollyloki@gmail.com>
|
|
Date: Wed, 11 Oct 2023 00:45:53 -0400
|
|
Subject: [PATCH] Add API to get the collision shape of a block before it's
|
|
placed
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
index de4bbb73a78d037b99d662df130c7e122fda6cee..162e10ce5481d1f94afae595114920ef9df51c61 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
@@ -679,6 +679,20 @@ public class CraftBlockData implements BlockData {
|
|
return this.state.isFaceSturdy(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CraftBlock.blockFaceToNotch(face), CraftBlockSupport.toNMS(support));
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public org.bukkit.util.VoxelShape getCollisionShape(Location location) {
|
|
+ Preconditions.checkArgument(location != null, "location must not be null");
|
|
+
|
|
+ CraftWorld world = (CraftWorld) location.getWorld();
|
|
+ Preconditions.checkArgument(world != null, "location must not have a null world");
|
|
+
|
|
+ BlockPos position = CraftLocation.toBlockPosition(location);
|
|
+ net.minecraft.world.phys.shapes.VoxelShape shape = this.state.getCollisionShape(world.getHandle(), position);
|
|
+ return new org.bukkit.craftbukkit.util.CraftVoxelShape(shape);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public Color getMapColor() {
|
|
return Color.fromRGB(this.state.getMapColor(null, null).col);
|