diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index eb3c158..4f27207 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/ArtifactAbility.java b/src/sig/plugin/TwosideKeeper/HelperStructures/ArtifactAbility.java index 91ae44d..61c1a6a 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/ArtifactAbility.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/ArtifactAbility.java @@ -285,6 +285,7 @@ public enum ArtifactAbility { if (containsEnchantment(ability,item)) { for (int i=0;i enchants = getEnchantments(item); + for (ArtifactAbility ab : enchants.keySet()) { + TwosideKeeper.log("Checking for enchantment "+ab.GetName(), 2); + item = removeEnchantment(ab,item); + } + item = AwakenedArtifact.addAP(item, 0); + return item; + } + static boolean hasCurse(ItemStack item) { HashMap map = getEnchantments(item); if (map.containsKey(REDUCEDMG) || diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index b10d84a..60dbe16 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -1171,10 +1171,12 @@ public class TwosideKeeper extends JavaPlugin implements Listener { //aPlugin.API.sendActionBarMessage(p, "Testing/nMultiple Lines.\nLolz"); //TwosideKeeperAPI.setItemSet(p.getEquipment().getItemInMainHand(), ItemSet.PANROS); //p.getWorld().dropItemNaturally(p.getLocation(), TwosideKeeperAPI.generateMegaPiece(Material.LEATHER_CHESTPLATE, true, true, 5)); - p.getWorld().dropItemNaturally(p.getLocation(), UPGRADE_SHARD.getItemStack()); + /*p.getWorld().dropItemNaturally(p.getLocation(), UPGRADE_SHARD.getItemStack()); ItemStack upgrade = UPGRADE_SHARD.getItemStack(); GenericFunctions.setUpgradeShardTier(upgrade,3); - p.getWorld().dropItemNaturally(p.getLocation(), upgrade); + p.getWorld().dropItemNaturally(p.getLocation(), upgrade);*/ + log("In here",2); + ArtifactAbility.removeAllEnchantments(p.getEquipment().getItemInMainHand()); //p.sendMessage("This is tier "+GenericFunctions.getUpgradeShardTier(p.getEquipment().getItemInMainHand())); //ItemSet.SetTier(p.getEquipment().getItemInMainHand(), 7); //p.getWorld().dropItemNaturally(p.getLocation(), STRENGTHENING_VIAL.getItemStack(50)); diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java b/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java index 795fded..8d08846 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeperAPI.java @@ -92,6 +92,9 @@ public final class TwosideKeeperAPI { public static double getArtifactAbilityValue(ArtifactAbility ability, ItemStack item) { return GenericFunctions.getAbilityValue(ability, item); } + public static ItemStack removeAllArtifactAbilityPoints(ItemStack item) { + return ArtifactAbility.removeAllEnchantments(item); + } //Time Commands. public static long getServerTickTime() {