mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 05:55:44 +01:00
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TrollyLoki <trollyloki@gmail.com>
|
|
Date: Wed, 11 Oct 2023 00:45:54 -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/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
|
|
index 64188a78211195fe792eac427e483e1984f52318..fb4c7cf0f67f3e4227d17f6702ae7b7bf1c110ab 100644
|
|
--- a/src/main/java/org/bukkit/block/data/BlockData.java
|
|
+++ b/src/main/java/org/bukkit/block/data/BlockData.java
|
|
@@ -205,6 +205,19 @@ public interface BlockData extends Cloneable {
|
|
*/
|
|
boolean isFaceSturdy(@NotNull BlockFace face, @NotNull BlockSupport support);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Calculates the collision shape this block data would have at a particular location.
|
|
+ * <p>
|
|
+ * This does not take into account any block updates that may occur if the block was to be actually placed in the world.
|
|
+ *
|
|
+ * @param location the location to calculate the collision shape at
|
|
+ *
|
|
+ * @return a {@link org.bukkit.util.VoxelShape} representing the collision shape of this block data.
|
|
+ */
|
|
+ @NotNull org.bukkit.util.VoxelShape getCollisionShape(@NotNull Location location);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the color this block should appear as when rendered on a map.
|
|
*
|