Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
de04cbced5
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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
78 Zeilen
3.2 KiB
Diff
78 Zeilen
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ineusia <ineusia@yahoo.com>
|
|
Date: Mon, 26 Oct 2020 11:37:48 -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/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
index 4dcfff9aa28eec3467d49d6fcc00f22943fd9c92..137a40c708bb67de4608447975867a07240ddc88 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -681,4 +681,31 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
|
|
@Deprecated(forRemoval = true)
|
|
String getTranslationKey();
|
|
// Paper end
|
|
+
|
|
+ // Paper start - destroy speed API
|
|
+ /**
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
|
+ * <p>
|
|
+ * Default value is 1.0
|
|
+ *
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
|
+ */
|
|
+ default float getDestroySpeed(final @NotNull ItemStack itemStack) {
|
|
+ return this.getBlockData().getDestroySpeed(itemStack);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
|
+ * <p>
|
|
+ * Default value is 1.0
|
|
+ *
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
|
+ * @param considerEnchants true to look at enchants on the itemstack
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
|
+ */
|
|
+ default float getDestroySpeed(@NotNull ItemStack itemStack, boolean considerEnchants) {
|
|
+ return this.getBlockData().getDestroySpeed(itemStack, considerEnchants);
|
|
+ }
|
|
+ // Paper end - destroy speed API
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
|
|
index b70176b9ca3c3fb7d68aa7bc92b7ca6329255bd7..81351a057fc2647dfd53a95ed78077d74204086b 100644
|
|
--- a/src/main/java/org/bukkit/block/data/BlockData.java
|
|
+++ b/src/main/java/org/bukkit/block/data/BlockData.java
|
|
@@ -256,4 +256,29 @@ public interface BlockData extends Cloneable {
|
|
@NotNull
|
|
@ApiStatus.Experimental
|
|
BlockState createBlockState();
|
|
+
|
|
+ // Paper start - destroy speed API
|
|
+ /**
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
|
+ * <p>
|
|
+ * Default value is 1.0
|
|
+ *
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
|
+ */
|
|
+ default float getDestroySpeed(final @NotNull ItemStack itemStack) {
|
|
+ return this.getDestroySpeed(itemStack, false);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
|
+ * <p>
|
|
+ * Default value is 1.0
|
|
+ *
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
|
+ * @param considerEnchants true to look at enchants on the itemstack
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
|
+ */
|
|
+ float getDestroySpeed(@NotNull ItemStack itemStack, boolean considerEnchants);
|
|
+ // Paper end - destroy speed API
|
|
}
|