mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 30 Dec 2020 17:27:27 -0500
|
|
Subject: [PATCH] Additional Block Material API's
|
|
|
|
Faster version for isSolid() that utilizes NMS's state for isSolid instead of the slower
|
|
process to do this in the Bukkit API
|
|
|
|
Adds API for buildable, replaceable, burnable too.
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
index 4a408361ac86b8c490942686c2709817338f4f59..43a0e57a6db702b2a40e151f151bfaa63b9d95d5 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -438,6 +438,42 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
|
|
*/
|
|
boolean isLiquid();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Check if this block is solid
|
|
+ * <p>
|
|
+ * Determined by Minecraft, typically a block a player can use to place a new block to build things.
|
|
+ * An example of a non buildable block would be liquids, flowers, or fire
|
|
+ *
|
|
+ * @return true if block is buildable
|
|
+ */
|
|
+ boolean isBuildable();
|
|
+ /**
|
|
+ * Check if this block is burnable
|
|
+ * <p>
|
|
+ * Determined by Minecraft, typically a block that fire can destroy (Wool, Wood)
|
|
+ *
|
|
+ * @return true if block is burnable
|
|
+ */
|
|
+ boolean isBurnable();
|
|
+ /**
|
|
+ * Check if this block is replaceable
|
|
+ * <p>
|
|
+ * Determined by Minecraft, representing a block that is not AIR that you can still place a new block at, such as flowers.
|
|
+ * @return true if block is replaceable
|
|
+ */
|
|
+ boolean isReplaceable();
|
|
+ /**
|
|
+ * Check if this block is solid
|
|
+ * <p>
|
|
+ * Determined by Minecraft, typically a block a player can stand on and can't be passed through.
|
|
+ *
|
|
+ * This API is faster than accessing Material#isSolid as it avoids a material lookup and switch statement.
|
|
+ * @return true if block is solid
|
|
+ */
|
|
+ boolean isSolid();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the temperature of this block.
|
|
* <p>
|