From d7ce59a862c0c9f76944b7a6fbb7ce0c3445e7bc Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 17 Feb 2023 13:17:00 -0500
Subject: [PATCH] v2.0.0: added a safety check so weapons cannot get negative
 charges

---
 .../shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
index 1c60b8054..f514fdff3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
@@ -169,13 +169,13 @@ public class MeleeWeapon extends Weapon {
 
 		if (Dungeon.hero.belongings.weapon == this) {
 			charger.partialCharge -= abilityChargeUse(hero);
-			while (charger.partialCharge < 0) {
+			while (charger.partialCharge < 0 && charger.charges > 0) {
 				charger.charges--;
 				charger.partialCharge++;
 			}
 		} else {
 			charger.secondPartialCharge -= abilityChargeUse(hero);
-			while (charger.secondPartialCharge < 0) {
+			while (charger.secondPartialCharge < 0 && charger.secondCharges > 0) {
 				charger.secondCharges--;
 				charger.secondPartialCharge++;
 			}