36 lines
1.7 KiB
Diff
36 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 37eceaef1212e2ee13aa763a5ede24ec170e5391..9defb202761296a825d035e27ddc51e17a311647 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
@@ -766,5 +766,23 @@ public class CraftBlock implements Block {
|
||
|
|
public String getTranslationKey() {
|
||
|
|
return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public float getDestroySpeed(ItemStack itemStack, boolean considerEnchants) {
|
||
|
|
+ net.minecraft.world.item.ItemStack nmsItemStack;
|
||
|
|
+ if (itemStack instanceof CraftItemStack) {
|
||
|
|
+ nmsItemStack = ((CraftItemStack) itemStack).getHandle();
|
||
|
|
+ } else {
|
||
|
|
+ nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
|
||
|
|
+ }
|
||
|
|
+ float speed = nmsItemStack.getItem().getDestroySpeed(nmsItemStack, this.getNMSBlock().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
|
||
|
|
}
|