mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
26734e83b0
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 8085edde SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 04c7e13c PR-719: Add Player Profile API 71564210 SPIGOT-6910: Add BlockDamageAbortEvent CraftBukkit Changes: febaa1c6 SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 9dafd109 Don't send updates over large distances bdac46b0 SPIGOT-6782: EntityPortalEvent should not destroy entity when setTo() uses same world as getFrom() 8f361ece PR-1002: Add Player Profile API 911875d4 Increase outdated build delay e5f8a767 SPIGOT-6917: Use main scoreboard for /trigger a672a531 Clean up callBlockDamageEvent 8e1bdeef SPIGOT-6910: Add BlockDamageAbortEvent Spigot Changes: 6edb62f3 Rebuild patches 7fbc6a1e Rebuild patches * Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: de951355 SPIGOT-6927: Fix default value of spawn-limits in Worlds
57 lines
2 KiB
Diff
57 lines
2 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 839867cd0a92fc0ea2b9ea009b67a841f8c7edd6..bcf3dc1bc640dc270446db0e1da081272d3933f1 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>
|