2.2.032

Changelog.txt

@@ -1,6 +1,12 @@
 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)
+    Added Beetroot to experience.yml for Herbalism
+    Added Open_Eyeblossom to experience.yml for Herbalism
+    Addeed Open_Eyeblossom to config.yml Bonus Drops for Herbalism
+    Added Closed_Eyeblossom to experience.yml for Herbalism
+    Addeed Closed_Eyeblossom to config.yml Bonus Drops for Herbalism
 
     NOTES:
     A balance pass for Blast Mining is coming, but for now, I've reduced the total bonus drops and clamped the yield ceiling as Blast Mining is a bit too good.

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.032-SNAPSHOT</version>
+    <version>2.2.032</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

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) {

src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java

@@ -63,7 +63,7 @@ public class CrossbowsManager extends SkillManager {
         }
 
         // Spawn new arrow with the reflected direction
-        Arrow spawnedArrow = originalArrow.getWorld().spawnArrow(origin, reflectedDirection, 1, 1);
+        final Arrow spawnedArrow = originalArrow.getWorld().spawnArrow(origin, reflectedDirection, 1, 1);
         // copy some properties from the old arrow
         spawnedArrow.setShooter(originalArrowShooter);
         spawnedArrow.setCritical(originalArrow.isCritical());

src/main/resources/config.yml

@@ -484,6 +484,8 @@ Green_Thumb_Replanting_Crops:
 Bonus_Drops:
     Herbalism:
         Eyeblossom: true
+        Open_Eyeblossom: true
+        Closed_Eyeblossom: true
         Pitcher_Plant: true
         Torchflower: true
         Pink_Petals: true

src/main/resources/experience.yml

@@ -331,6 +331,8 @@ Experience_Values:
         Mushroom_Stem: 80
     Herbalism:
         Eyeblossom: 66
+        Open_Eyeblossom: 66
+        Closed_Eyeblossom: 66
         Pitcher_Plant: 160
         Pink_Petals: 10
         Small_Dripleaf: 140
@@ -397,6 +399,7 @@ Experience_Values:
         Cocoa: 30
         Potatoes: 50
         Wheat: 50
+        Beetroot: 50
         Beetroots: 50
         Nether_Wart: 50
         Dead_Bush: 30

src/test/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsTest.java

@@ -90,6 +90,7 @@ class AcrobaticsTest extends MMOTestEnvironment {
 
     private @NotNull EntityDamageEvent mockEntityDamageEvent(double damage) {
         final EntityDamageEvent mockEvent = mock(EntityDamageEvent.class);
+        when(mockEvent.isApplicable(any(EntityDamageEvent.DamageModifier.class))).thenReturn(true);
         when(mockEvent.getCause()).thenReturn(EntityDamageEvent.DamageCause.FALL);
         when(mockEvent.getFinalDamage()).thenReturn(damage);
         when(mockEvent.getDamage(any(EntityDamageEvent.DamageModifier.class))).thenReturn(damage);