From 939c000a221e16194c39ca691802fad604cc5cd0 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 11 Oct 2017 22:44:40 -0400
Subject: [PATCH] v0.6.2: improved logic for swapping misc items with a full
 inventory

---
 .../shatteredpixeldungeon/items/KindofMisc.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java
index cf9c50d10..a14650ffc 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java
@@ -50,9 +50,17 @@ public abstract class KindofMisc extends EquipableItem {
 						protected void onSelect(int index) {
 
 							KindofMisc equipped = (index == 0 ? m1 : m2);
-							if (equipped.doUnequip(hero, true, false)) {
+							if (!equipped.cursed) {
+								if (index == 0){
+									hero.belongings.misc1 = null;
+								} else {
+									hero.belongings.misc2 = null;
+								}
 								//fully re-execute rather than just call doEquip as we want to preserve quickslot
 								execute(hero, AC_EQUIP);
+								equipped.collect();
+							} else {
+								GLog.w(Messages.get(EquipableItem.class, "unequip_cursed"));
 							}
 						}
 					});