v2.1.0: fixed a rare crash caused by grim enchantment

2023-05-30 12:29:39 -04:00
parent 9a8d007133
commit 82297c36af
1 changed files with 3 additions and 1 deletions
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java
@@ -46,7 +46,9 @@ public class Grim extends Weapon.Enchantment {
 		//see Char.damage
 		Buff.affect(defender, GrimTracker.class).maxChance = maxChance;

-		if (attacker instanceof Hero && weapon.hasEnchant(Grim.class, attacker)){
+		if (defender.buff(GrimTracker.class) != null
+				&& attacker instanceof Hero
+				&& weapon.hasEnchant(Grim.class, attacker)){
 			defender.buff(GrimTracker.class).qualifiesForBadge = true;
 		}