Stripped out current mining speed check

This commit is contained in:
Auxilor
2022-04-22 20:15:02 +01:00
parent 7be5fbfbc4
commit 9a3aac9a66
6 changed files with 10 additions and 58 deletions

View File

@@ -256,20 +256,6 @@ public interface FastItemStack extends PersistentDataHolder {
*/
void setCustomModelData(@Nullable Integer data);
/**
* Get the speed multiplier.
*
* @return The multiplier.
*/
double getDestroySpeedMultiplier();
/**
* Set the speed multiplier.
*
* @param multiplier The multiplier.
*/
void setDestroySpeedMultiplier(double multiplier);
/**
* Get the Bukkit ItemStack again.
*

View File

@@ -18,6 +18,7 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -26,6 +27,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -528,7 +530,9 @@ public final class Items {
public static ItemStack setDestroySpeedMultiplier(@NotNull final ItemStack itemStack,
final double multiplier) {
FastItemStack fis = FastItemStack.wrap(itemStack);
fis.setDestroySpeedMultiplier(multiplier);
PersistentDataContainer tag = fis.getBaseTag();
tag.set(NamespacedKeyUtils.createEcoKey("break_speed"), PersistentDataType.DOUBLE, multiplier);
fis.setBaseTag(tag);
return fis.unwrap();
}
@@ -540,7 +544,11 @@ public final class Items {
*/
public static double getDestroySpeedMultiplier(@NotNull final ItemStack itemStack) {
FastItemStack fis = FastItemStack.wrap(itemStack);
return fis.getDestroySpeedMultiplier();
PersistentDataContainer tag = fis.getBaseTag();
return Objects.requireNonNullElse(
tag.get(NamespacedKeyUtils.createEcoKey("break_speed"), PersistentDataType.DOUBLE),
1.0
);
}
private Items() {