From f9290df028256e7ce3ad1ba4435d7b48e94763d8 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 11 Jan 2021 18:35:15 -0500
Subject: [PATCH] v0.9.1c: improved blacksmith logic when upgraded item is
 equipped

---
 .../actors/mobs/npcs/Blacksmith.java                     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
index 2a2328f3c..cfa828d35 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
@@ -225,10 +225,6 @@ public class Blacksmith extends NPC {
 				Dungeon.level.drop( seal, Dungeon.hero.pos );
 			}
 		}
-		
-		if (first.isEquipped( Dungeon.hero )) {
-			((EquipableItem)first).doUnequip( Dungeon.hero, true );
-		}
 
 		//preserves enchant/glyphs if present
 		if (first instanceof Weapon && ((Weapon) first).hasGoodEnchant()){
@@ -238,11 +234,6 @@ public class Blacksmith extends NPC {
 		} else {
 			first.upgrade();
 		}
-		if (!Dungeon.hero.belongings.contains(first)) {
-			if (!first.collect()){
-				Dungeon.level.drop( first, Dungeon.hero.pos );
-			}
-		}
 		Dungeon.hero.spendAndNext( 2f );
 		Badges.validateItemLevelAquired( first );
 		Item.updateQuickslot();