From 6bee83e8c1e83c096ba309c20d6768375f06acb9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 5 Apr 2022 15:33:25 -0400 Subject: [PATCH] v1.2.2: fixed blacksmith being able to work with specific cursed items --- .../shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 6cd2d53b5..a16ff21b9 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 @@ -184,7 +184,11 @@ public class Blacksmith extends NPC { return Messages.get(Blacksmith.class, "un_ided"); } - if (item1.cursed || item2.cursed) { + if (item1.cursed || item2.cursed || + (item1 instanceof Armor && ((Armor) item1).hasCurseGlyph()) || + (item2 instanceof Armor && ((Armor) item2).hasCurseGlyph()) || + (item1 instanceof Weapon && ((Weapon) item1).hasCurseEnchant()) || + (item2 instanceof Weapon && ((Weapon) item2).hasCurseEnchant())) { return Messages.get(Blacksmith.class, "cursed"); }