mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
d8e07590e3
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: 5dbedae1 PR-864: Fix Registry#match() failing namespaced inputs 49256865 PR-863: Fix boolean PersistentDataType 9f15450b SPIGOT-7195, SPIGOT-7197: Add DataPack API ebef5b6a Disable InterfaceIsType Checkstyle check 01d577f5 Slight tweak to boolean PersistentDataType javadoc d2b99e56 PR-857: Add boolean PersistentDataType CraftBukkit Changes: 2270366cd PR-1196: Test Registry instances more thoroughly 863dacb7a PR-1191: Do not start on pre-release Java 17 1f2dd8e12 SPIGOT-7362: Properly handle null in CraftBlock#blockFaceToNotch() dbc70bed5 SPIGOT-7195, SPIGOT-7197: Add DataPack API
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ineusia <ineusia@yahoo.com>
|
|
Date: Mon, 26 Oct 2020 11:48:06 -0500
|
|
Subject: [PATCH] Add Destroy Speed API
|
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
index 1cfbe11ba3e82071bad8b723ac781818268414f2..5cca837474205eaa7bffadf31a60bf352ef7365b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
@@ -701,5 +701,26 @@ public class CraftBlock implements Block {
|
|
public String translationKey() {
|
|
return this.getNMS().getBlock().getDescriptionId();
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public float getDestroySpeed(ItemStack itemStack, boolean considerEnchants) {
|
|
+ net.minecraft.world.item.ItemStack nmsItemStack;
|
|
+ if (itemStack instanceof CraftItemStack) {
|
|
+ nmsItemStack = ((CraftItemStack) itemStack).handle;
|
|
+ if (nmsItemStack == null) {
|
|
+ nmsItemStack = net.minecraft.world.item.ItemStack.EMPTY;
|
|
+ }
|
|
+ } else {
|
|
+ nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
|
|
+ }
|
|
+ float speed = nmsItemStack.getDestroySpeed(this.getNMS().getBlock().defaultBlockState());
|
|
+ if (speed > 1.0F && considerEnchants) {
|
|
+ int enchantLevel = net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.BLOCK_EFFICIENCY, nmsItemStack);
|
|
+ if (enchantLevel > 0) {
|
|
+ speed += enchantLevel * enchantLevel + 1;
|
|
+ }
|
|
+ }
|
|
+ return speed;
|
|
+ }
|
|
// Paper end
|
|
}
|