Skip to content

Commit

Permalink
Another 1.13.2 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
nossr50 committed Aug 19, 2020
1 parent e5f1738 commit 7ea9ec5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
@@ -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;
Expand Down Expand Up @@ -53,10 +51,6 @@ public void setFurnaceOwner(@NotNull Furnace furnace, @NotNull UUID uuid) {

@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) {
Expand All @@ -68,10 +62,6 @@ public void setSuperAbilityBoostedItem(@NotNull ItemStack itemStack, int origina
itemStack.setItemMeta(itemMeta);
}

private Metadatable getMetadatable(@NotNull ItemStack itemStack) {
return (Metadatable) itemStack;
}

@Override
public boolean isSuperAbilityBoosted(@NotNull ItemStack itemStack) {
ItemMeta itemMeta = itemStack.getItemMeta();
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
Expand Up @@ -23,7 +23,10 @@
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;
Expand Down

0 comments on commit 7ea9ec5

Please sign in to comment.