diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java index 92e19d22..16376023 100644 --- a/src/engine/objects/CharacterItemManager.java +++ b/src/engine/objects/CharacterItemManager.java @@ -1058,6 +1058,7 @@ public class CharacterItemManager { i.addToCache(); try { i.stripCastableEnchants(); + this.updateInventory(); }catch(Exception ignored){ Logger.error("FAILED TO STRIP CASTABLE ENCHANTS: Move Item To Bank"); } @@ -1203,6 +1204,7 @@ public class CharacterItemManager { try { i.stripCastableEnchants(); + this.updateInventory(); }catch(Exception ignored){ Logger.error("FAILED TO STRIP CASTABLE ENCHANTS: Move Item To Vault"); } diff --git a/src/engine/objects/Item.java b/src/engine/objects/Item.java index 056df1cd..77d250c9 100644 --- a/src/engine/objects/Item.java +++ b/src/engine/objects/Item.java @@ -819,19 +819,30 @@ public class Item extends AbstractWorldObject { public void stripCastableEnchants(){ try { - ArrayList ToRemove = new ArrayList<>(); - for (Effect eff : this.effects.values()) { - if (eff.getJobContainer() != null && !eff.getJobContainer().noTimer()) { - eff.endEffectNoPower(); - eff.getJobContainer().cancelJob(); - ToRemove.add(eff); - } + //ArrayList ToRemove = new ArrayList<>(); + //for (Effect eff : this.effects.values()) { + // if (eff.getJobContainer() != null && !eff.getJobContainer().noTimer()) { + // eff.endEffectNoPower(); + // eff.getJobContainer().cancelJob(); + // ToRemove.add(eff); + // } + //} + + //strip procs + if(this.effects.get("EnchantWeapon") != null){ + this.effects.remove("EnchantWeapon"); + Effect eff = this.effects.get("EnchantWeapon"); + eff.endEffectNoPower(); } - for(Effect eff : ToRemove)//{ - this.effects.remove(eff.getEffectsBase().getIDString()); - //} + //strip forge master hone armor + if(this.effects.get("1000") != null){ + this.effects.remove("1000"); + Effect eff = this.effects.get("1000"); + eff.endEffectNoPower(); + } + this.applyAllBonuses(); //this.effects.values().removeAll(ToRemove); }catch(Exception ignored){