From a0cec969c8973ee30abd67c86adf3e79da85bf01 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 25 Aug 2024 14:12:55 -0400
Subject: [PATCH] v2.5.0: fixed cases where upgrade window change causes a
 crash

---
 .../shatteredpixeldungeon/windows/WndUpgrade.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUpgrade.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUpgrade.java
index 4c1cc8cd2..4c9ec7349 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUpgrade.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUpgrade.java
@@ -82,7 +82,7 @@ public class WndUpgrade extends Window {
 		int quantity = upgrader.quantity();
 		Item moreUpgradeItem = Dungeon.hero.belongings.getItem(upgrader.getClass());
 
-		if (moreUpgradeItem != upgrader){
+		if (moreUpgradeItem != null && moreUpgradeItem != upgrader){
 			quantity += moreUpgradeItem.quantity();
 		}