소스 검색

Add missing Herbalism entries to config

nossr50 6 년 전
부모
커밋
28c7fdd4e2
3개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      Changelog.txt
  2. 4 0
      src/main/java/com/gmail/nossr50/listeners/BlockListener.java
  3. 5 0
      src/main/resources/config.yml

+ 2 - 1
Changelog.txt

@@ -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.
 

+ 4 - 0
src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -71,11 +71,15 @@ public class BlockListener implements Listener {
                 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);
             }
         }
     }

+ 5 - 0
src/main/resources/config.yml

@@ -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