From 6ae05638576ea08de6a2a204c3a5e3b4b65327d5 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 20 Mar 2023 19:51:06 -0400
Subject: [PATCH] v2.0.1: cleanup up some rankings errors with duelist unlock
 badge

---
 .../java/com/shatteredpixel/shatteredpixeldungeon/Badges.java | 4 ++++
 .../shatteredpixeldungeon/items/weapon/Weapon.java            | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index cf94cbf5c..b5ba2a7b5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -518,6 +518,10 @@ public class Badges {
 		if (!item.levelKnown || item instanceof Artifact) {
 			return;
 		}
+
+		if (item instanceof MeleeWeapon){
+			validateDuelistUnlock();
+		}
 		
 		Badge badge = null;
 		if (!local.contains( Badge.ITEM_LEVEL_1 ) && item.level() >= 3) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
index 445fa3fc3..054217cad 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
@@ -289,9 +289,7 @@ abstract public class Weapon extends KindOfWeapon {
 		
 		cursed = false;
 
-		Item result = super.upgrade();
-		Badges.validateDuelistUnlock();
-		return result;
+		return super.upgrade();
 	}
 	
 	@Override