From af1c4cb3cd58f28ebf5c5a4922e06c9cb2101eb5 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 28 Nov 2022 11:16:31 -0500
Subject: [PATCH] v2.0.0: added a safety check to prevent crashes with duelist
 unlock

---
 .../java/com/shatteredpixel/shatteredpixeldungeon/Badges.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index 4c15a5cdc..6b065e19f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -867,7 +867,8 @@ public class Badges {
 	}
 
 	public static void validateDuelistUnlock(){
-		if (!isUnlocked(Badge.UNLOCK_HUNTRESS) && Dungeon.hero.belongings.weapon instanceof MeleeWeapon
+		if (!isUnlocked(Badge.UNLOCK_HUNTRESS) && Dungeon.hero != null
+				&& Dungeon.hero.belongings.weapon instanceof MeleeWeapon
 				&& ((MeleeWeapon) Dungeon.hero.belongings.weapon).tier >= 2
 				&& ((MeleeWeapon) Dungeon.hero.belongings.weapon).STRReq() <= Dungeon.hero.STR()){