Skip to content

Commit

Permalink
Add missing Herbalism entries to config
Browse files Browse the repository at this point in the history
  • Loading branch information
nossr50 committed Mar 30, 2019
1 parent 53534e0 commit 28c7fdd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ Key:
- Removal

Version 2.1.30
Fixed yet another bug involving double drops
Fixed double drops behaving oddly
DoubleDrop config tables now must contain all things that can possibly be doubled, such as the Ore block, the ore itself, etc.
Added the following items to the DoubleDrop tables for Mining: Coal, Diamond, Emerald, Glowstone_Dust, Iron_Ingot, Lapis_Lazuli, Nether_Quartz, Redstone, Cobblestone
Added the following items to the DoubleDrop tables for Herbalism: Beetroot, Carrot, Cocoa_Beans, Melon_Slice, Potatoe

NOTE: I'm gonna have to blame Bukkit on this one, several API methods I used are actually unfinished and kind of janky. So I hacked something together to make them work.

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gmail/nossr50/listeners/BlockListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,15 @@ public void onBlockDropItemEvent(BlockDropItemEvent event)
continue;

if(event.getBlock().getState().getMetadata(mcMMO.doubleDrops).size() > 0)
{
event.getBlock().getState().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
event.getBlock().getState().removeMetadata(mcMMO.doubleDrops, plugin);
}
else if(event.getBlock().getState().getMetadata(mcMMO.tripleDrops).size() > 0)
{
event.getBlock().getState().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
event.getBlock().getState().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is);
event.getBlock().getState().removeMetadata(mcMMO.tripleDrops, plugin);
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -429,14 +429,19 @@ Skills:
Double_Drops:
Herbalism:
Beetroots: true
Beetroot: true
Brown_Mushroom: true
Cactus: true
Carrots: true
Carrot: true
Cocoa: true
Cocoa_Beans: true
Wheat: true
Melon: true
Melon_Slice: true
Nether_Wart: true
Potatoes: true
Potatoe: true
Pumpkin: true
Red_Mushroom: true
Sugar_Cane: true
Expand Down

0 comments on commit 28c7fdd

Please sign in to comment.