From 2fd86e870f1bcc0cd3e9a56fe444d84a72eb937b Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 19 Sep 2024 18:39:36 -0700
Subject: [PATCH 1/2] dev mode

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6e77c3db4..ce9d8e38a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.020</version>
+    <version>2.2.021-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

From 1c08cac2f898608ce8fd923aa8dd03e8a1e58a1f Mon Sep 17 00:00:00 2001
From: Ineusia <ineusia@yahoo.com>
Date: Thu, 19 Sep 2024 21:39:56 -0400
Subject: [PATCH 2/2] Fix acrobatics (#5088)

---
 .../datatypes/skills/subskills/acrobatics/Roll.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 ebe3b0c72..530c7ec02 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
@@ -76,7 +76,12 @@ public class Roll extends AcrobaticsSubSkill {
                     // no-op - fall was fatal or otherwise did not get processed
                     return false;
                 }
-                entityDamageEvent.setDamage(rollResult.getModifiedDamage());
+
+                // Clear out the damage from falling so that way our modified damage doesn't get re-reduced by protection/feather falling
+                entityDamageEvent.setDamage(0);
+                // Send the damage is MAGIC so that it cuts through all resistances
+                // This is fine because we considered protection/featherfalling in the rollCheck method
+                entityDamageEvent.setDamage(EntityDamageEvent.DamageModifier.MAGIC, rollResult.getModifiedDamage());
 
                 if (entityDamageEvent.getFinalDamage() == 0) {
                     entityDamageEvent.setCancelled(true);
@@ -216,7 +221,7 @@ public class Roll extends AcrobaticsSubSkill {
      */
     @VisibleForTesting
     public RollResult rollCheck(McMMOPlayer mmoPlayer, EntityDamageEvent entityDamageEvent) {
-        double baseDamage = entityDamageEvent.getDamage();
+        double baseDamage = entityDamageEvent.getFinalDamage();
         final boolean isGraceful = mmoPlayer.getPlayer().isSneaking();
         final RollResult.Builder rollResultBuilder
                 = new RollResult.Builder(entityDamageEvent, isGraceful);