From ef2aa57be3156a8fdbebf74410215392c9b8d197 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 8 Mar 2025 11:34:29 -0800
Subject: [PATCH] fix Roll interactions with CMI fixes #5151

---
 Changelog.txt                                                  | 1 +
 .../nossr50/datatypes/skills/subskills/acrobatics/Roll.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 5fe398f23..7af73d49b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,5 @@
 Version 2.2.032
+    Fixed bug where Roll would throw exceptions with certain CMI interactions
     Blast Mining no longer drops infested block variants
     Reduced bonus drops on Blast Mining and randomized results (see notes)
 
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
index 99bb1b457..b4cc9ba74 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
@@ -56,7 +56,8 @@ public class Roll extends AcrobaticsSubSkill {
         final EntityDamageEvent entityDamageEvent = (EntityDamageEvent) event;
 
         //Make sure a real player was damaged in this event
-        if (!EventUtils.isRealPlayerDamaged(entityDamageEvent))
+        if (!EventUtils.isRealPlayerDamaged(entityDamageEvent)
+                || !entityDamageEvent.isApplicable(EntityDamageEvent.DamageModifier.MAGIC))
             return false;
 
         if (entityDamageEvent.getCause() == EntityDamageEvent.DamageCause.FALL) {