diff --git a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java index 03d3235ae..b15653a55 100644 --- a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java +++ b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java @@ -3,10 +3,10 @@ package com.gmail.nossr50.api; import java.util.ArrayList; import java.util.List; -import org.getspout.spoutapi.inventory.SpoutItemStack; +import org.bukkit.inventory.ItemStack; public class SpoutToolsAPI { - public static List spoutSwords = new ArrayList(); + public static List spoutSwords = new ArrayList(); /** * Add a custom Spout sword to mcMMO for XP gain & ability use. @@ -15,7 +15,7 @@ public class SpoutToolsAPI { * * @param spoutSword The sword to add */ - public void addCustomSword(SpoutItemStack spoutSword) { + public void addCustomSword(ItemStack spoutSword) { spoutSwords.add(spoutSword); } } diff --git a/src/main/java/com/gmail/nossr50/util/ItemChecks.java b/src/main/java/com/gmail/nossr50/util/ItemChecks.java index 80c977c05..e0f2fcc3e 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemChecks.java +++ b/src/main/java/com/gmail/nossr50/util/ItemChecks.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.util; import org.bukkit.inventory.ItemStack; -import org.getspout.spoutapi.inventory.SpoutItemStack; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.api.SpoutToolsAPI; @@ -33,7 +32,7 @@ public class ItemChecks { if (customToolsEnabled && CustomToolsConfig.getInstance().customSwordIDs.contains(is.getTypeId())) { return true; } - else if (mcMMO.p.spoutEnabled && is instanceof SpoutItemStack && SpoutToolsAPI.spoutSwords.contains((SpoutItemStack) is)) { + else if (mcMMO.p.spoutEnabled && SpoutToolsAPI.spoutSwords.contains(is)) { return true; } else {