From 82297c36af12e254963255101087e54d3da41a85 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 30 May 2023 12:29:39 -0400
Subject: [PATCH] v2.1.0: fixed a rare crash caused by grim enchantment

---
 .../shatteredpixeldungeon/items/weapon/enchantments/Grim.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 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
index 372ffbe5b..6ceb68b99 100644
--- 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;
 		}