geforkt von Mirrors/Paper
170382fe35
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: e7b0f8d6 #642: Add Crafting methods to API 9e58831e SPIGOT-6641: Use varargs in sendMessage e409fe49 SPIGOT-6545: Unable to set Guardian target via API while awareness is disabled 6997c726 SPIGOT-6661: Fix missing radius from GenericGameEvent 02d03f35 SPIGOT-6369: Add ItemStack to HangingPlaceEvent CraftBukkit Changes: 0abf420c SPIGOT-6665: Shearing a Snowman does not drop a carved pumpkin e8e3cbcc #893: Add Crafting methods to API 879acfee Fix missing varargs from previous commit 6572b9c3 SPIGOT-6641: Use varargs in sendMessage 9e06bb2a SPIGOT-6663: Chicken Jockeys chickens don't despawn 699f2d36 SPIGOT-6545: Unable to set Guardian target via API while awareness is disabled 8ffa54ba SPIGOT-6369: Add ItemStack to HangingPlaceEvent c851639c SPIGOT-6645: Call EntityChangeBlockEvent before PlayerHarvestBlockEvent 8d244b0b SPIGOT-3725, SPIGOT-6638, MC-136917: Properly clear tile entities before replacing Spigot Changes: 18c71bf4 Rebuild patches
41 Zeilen
1.6 KiB
Diff
41 Zeilen
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 30 Dec 2020 19:43:01 -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/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
index dbb1e219be66e37829ec5be585a9881d589cf6e6..aa1ef5bb1e27e8c45710299febb2d6c6b122ff15 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
@@ -618,6 +618,25 @@ public class CraftBlock implements Block {
|
|
return this.getNMS().getMaterial().isLiquid();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public boolean isBuildable() {
|
|
+ return getNMS().getMaterial().isSolid(); // This is in fact isSolid, despite the fact that isSolid below returns blocksMotion
|
|
+ }
|
|
+ @Override
|
|
+ public boolean isBurnable() {
|
|
+ return getNMS().getMaterial().isFlammable();
|
|
+ }
|
|
+ @Override
|
|
+ public boolean isReplaceable() {
|
|
+ return getNMS().getMaterial().isReplaceable();
|
|
+ }
|
|
+ @Override
|
|
+ public boolean isSolid() {
|
|
+ return getNMS().getMaterial().blocksMotion();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public PistonMoveReaction getPistonMoveReaction() {
|
|
return PistonMoveReaction.getById(this.getNMS().getPistonPushReaction().ordinal());
|