Calculates bonus drops based on base amount

- Ensures bonus drops from block breaking are calculated based on the base drop amount (without enchantments like Fortune) rather than the modified amount. This resolves an issue where bonus drops were being incorrectly calculated when Fortune or other drop-modifying plugins were active.

Author: hudsonandres

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -32,6 +32,7 @@
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -121,15 +122,25 @@ public void onBlockDropItemEvent(BlockDropItemEvent event) {
                 final MetadataValue bonusDropMeta = block
                         .getMetadata(METADATA_KEY_BONUS_DROPS).get(0);
                 if (blockCount <= 1) {
+                    // Get the base drops (without Fortune/enchantments) to calculate bonus properly
+                    // This runs at LOWEST priority, so Fortune has already been applied
+                    final Player player = event.getPlayer();
+                    final ItemStack tool = player.getInventory().getItemInMainHand();
+                    final ItemStack toolWithoutEnchants = tool.clone();
+                    
+                    // Remove all enchantments from the cloned tool
+                    toolWithoutEnchants.getEnchantments().keySet().forEach(toolWithoutEnchants::removeEnchantment);
+                    
+                    final Collection<ItemStack> baseDrops = block.getDrops(toolWithoutEnchants);
+                    
                     for (final Item item : eventItems) {
                         final ItemStack eventItemStack = item.getItemStack();
-                        int originalAmount = eventItemStack.getAmount();
-
+                        final Material itemType = eventItemStack.getType();
+                        
                         if (eventItemStack.getAmount() <= 0) {
                             continue;
                         }
 
-                        final Material itemType = eventItemStack.getType();
                         if (!mcMMO.p.getGeneralConfig()
                                 .getDoubleDropsEnabled(PrimarySkillType.MINING, itemType)
                                 && !mcMMO.p.getGeneralConfig()
@@ -146,9 +157,26 @@ public void onBlockDropItemEvent(BlockDropItemEvent event) {
                             }
                         }
 
-                        int amountToAddFromBonus = bonusDropMeta.asInt();
+                        // Find the base amount for this item type (before Fortune)
+                        int baseAmount = 0;
+                        for (ItemStack baseDrop : baseDrops) {
+                            if (baseDrop.getType() == itemType) {
+                                baseAmount = baseDrop.getAmount();
+                                break;
+                            }
+                        }
+                        
+                        // Calculate bonus based on the BASE amount, not the Fortune-modified amount
+                        // Since we're at LOWEST priority, other plugins have already modified the drops
+                        // So we add our bonus based on the vanilla base amount
+                        int bonusMultiplier = bonusDropMeta.asInt();
+                        int bonusToAdd = baseAmount * bonusMultiplier;
+                        
+                        int originalAmount = eventItemStack.getAmount();
+                        int newAmount = originalAmount + bonusToAdd;
+                        
                         final McMMOModifyBlockDropItemEvent modifyBlockDropItemEvent
-                                = new McMMOModifyBlockDropItemEvent(event, item, amountToAddFromBonus);
+                                = new McMMOModifyBlockDropItemEvent(event, item, newAmount);
                         plugin.getServer().getPluginManager().callEvent(modifyBlockDropItemEvent);
                         if (!modifyBlockDropItemEvent.isCancelled()
                                 && modifyBlockDropItemEvent.getModifiedItemStackQuantity() > originalAmount) {