nossr50 6 years ago
parent
commit
f5f4182a90

+ 3 - 0
Changelog.txt

@@ -1,3 +1,6 @@
+Version 2.1.75
+    Fixed a bug that prevented Fortune from working correctly if a Double Drop was triggered
+
 Version 2.1.74
 Version 2.1.74
     Fixed a NPE that could occur during certain events if a skill was disabled in coreskills.yml (Sorry!)
     Fixed a NPE that could occur during certain events if a skill was disabled in coreskills.yml (Sorry!)
 
 

+ 1 - 1
pom.xml

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

+ 3 - 2
src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -76,10 +76,11 @@ public class BlockListener implements Listener {
                 for (int i = 0; i < bonusCount; i++) {
                 for (int i = 0; i < bonusCount; i++) {
                     event.getBlock().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
                     event.getBlock().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
                 }
                 }
-
-                event.getBlock().removeMetadata(mcMMO.BONUS_DROPS_METAKEY, plugin);
             }
             }
         }
         }
+
+        if(event.getBlock().hasMetadata(mcMMO.BONUS_DROPS_METAKEY))
+            event.getBlock().removeMetadata(mcMMO.BONUS_DROPS_METAKEY, plugin);
     }
     }
 
 
     /*@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     /*@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

+ 0 - 2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -73,8 +73,6 @@ public class MiningManager extends SkillManager {
             return;
             return;
         }
         }
 
 
-        Material material = blockState.getType();
-
         if (mcMMOPlayer.getAbilityMode(skill.getAbility())) {
         if (mcMMOPlayer.getAbilityMode(skill.getAbility())) {
             SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage());
             SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage());
         }
         }