From 4a3228533a5a7db0ff8339e35c5ecbfed2dc8fbb Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 6 Jan 2023 16:11:34 -0500 Subject: [PATCH] v2.0.0: fixed cursed items being non-removable when in lost invent --- .../shatteredpixeldungeon/items/EquipableItem.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java index 817f54361..c4cd4c51d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java @@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LostInventory; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicImmune; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; @@ -116,7 +117,9 @@ public abstract class EquipableItem extends Item { public boolean doUnequip( Hero hero, boolean collect, boolean single ) { - if (cursed && hero.buff(MagicImmune.class) == null) { + if (cursed + && hero.buff(MagicImmune.class) == null + && (hero.buff(LostInventory.class) == null || keptThoughLostInvent)) { GLog.w(Messages.get(EquipableItem.class, "unequip_cursed")); return false; }