From 7ea9ec5c2ff8290df400618a2b1f88f26d8e7926 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 18 Aug 2020 20:28:09 -0700 Subject: [PATCH] Another 1.13.2 fix --- .../persistentdata/SpigotTemporaryDataLayer.java | 10 ---------- .../java/com/gmail/nossr50/util/skills/SkillUtils.java | 5 ++++- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/util/compat/layers/persistentdata/SpigotTemporaryDataLayer.java b/src/main/java/com/gmail/nossr50/util/compat/layers/persistentdata/SpigotTemporaryDataLayer.java index 17a68b325..744dbf830 100644 --- a/src/main/java/com/gmail/nossr50/util/compat/layers/persistentdata/SpigotTemporaryDataLayer.java +++ b/src/main/java/com/gmail/nossr50/util/compat/layers/persistentdata/SpigotTemporaryDataLayer.java @@ -1,11 +1,9 @@ package com.gmail.nossr50.util.compat.layers.persistentdata; -import com.gmail.nossr50.datatypes.meta.SuperAbilityToolMeta; import com.gmail.nossr50.datatypes.meta.UUIDMeta; import com.gmail.nossr50.mcMMO; import org.bukkit.block.Furnace; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Item; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.tags.CustomItemTagContainer; @@ -53,10 +51,6 @@ public class SpigotTemporaryDataLayer extends AbstractPersistentDataLayer { @Override public void setSuperAbilityBoostedItem(@NotNull ItemStack itemStack, int originalDigSpeed) { - Metadatable metadatable = getMetadatable(itemStack); - metadatable.setMetadata(ABILITY_TOOL_METADATA_KEY, new SuperAbilityToolMeta(originalDigSpeed, mcMMO.p)); - - ItemMeta itemMeta = itemStack.getItemMeta(); if(itemMeta == null) { @@ -68,10 +62,6 @@ public class SpigotTemporaryDataLayer extends AbstractPersistentDataLayer { itemStack.setItemMeta(itemMeta); } - private Metadatable getMetadatable(@NotNull ItemStack itemStack) { - return (Metadatable) itemStack; - } - @Override public boolean isSuperAbilityBoosted(@NotNull ItemStack itemStack) { ItemMeta itemMeta = itemStack.getItemMeta(); diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index 5ff38705a..316588013 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -23,7 +23,10 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; -import org.bukkit.inventory.*; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.Recipe; +import org.bukkit.inventory.ShapedRecipe; +import org.bukkit.inventory.ShapelessRecipe; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.jetbrains.annotations.NotNull;