1.3.1-DEVBUILD.2

Author: MrButtersDEV

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.thezircon.play</groupId>
     <artifactId>AutoPickup</artifactId>
-    <version>1.3.1-DEVBUILD.1</version>
+    <version>1.3.1-DEVBUILD.2</version>
     <packaging>jar</packaging>
 
     <name>AutoPickup</name>

src/main/java/us/thezircon/play/autopickup/AutoPickup.java

@@ -36,6 +36,7 @@ public final class AutoPickup extends JavaPlugin {
     public static boolean usingUpgradableHoppers = false; // UpgradableHoppers Patch
     public static boolean usingLocketteProByBrunyman = false; // LockettePro Patch
     public static boolean usingBentoBox = false; // BentoBox - AOneBlock Patch
+    public static boolean usingMCMMO = false;
     public static ArrayList<String> worldsBlacklist = null;
 
     // Custom Items Patch
@@ -52,6 +53,10 @@ public void onEnable() {
         createBlacklist();
         createPlayerDataDir();
 
+        // MCMMO Patch
+        if ((getServer().getPluginManager().getPlugin("mcMMO") != null)) {
+            usingMCMMO = true;
+        }
         // UpgradableHoppers Patch
         if ((getServer().getPluginManager().getPlugin("UpgradeableHoppers") != null)) {
             usingUpgradableHoppers = true;

src/main/java/us/thezircon/play/autopickup/listeners/BlockBreakEventListener.java

@@ -28,6 +28,7 @@
 
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 public class BlockBreakEventListener implements Listener {
@@ -145,7 +146,7 @@ public void run() {
                 }
             }
 
-            e.setDropItems(false); // Cancel drops
+             e.setDropItems(false); // Cancel drops
 
             if (((Container) block.getState()).getInventory() instanceof DoubleChestInventory) {
                 Chest chest = (Chest) block.getState();
@@ -202,8 +203,20 @@ public void run() {
         ArrayList<Material> verticalReqDown = crops.getVerticalReqDown();
 
         if (verticalReq.contains(e.getBlock().getType()) || verticalReqDown.contains(e.getBlock().getType())) {
-            e.setDropItems(false);
-            vertBreak(player, e.getBlock().getLocation());
+            //e.setDropItems(false);
+            //vertBreak(player, e.getBlock().getLocation());
+            Location tempLoc = loc.clone();
+            while(true) {
+                tempLoc.setY(tempLoc.getY() + 1.0D);
+                String key2 = tempLoc.getBlockX()+";"+tempLoc.getBlockY()+";"+tempLoc.getBlockZ()+";"+tempLoc.getWorld();
+                if (!(verticalReq.contains(tempLoc.getBlock().getType()))) {
+                    //this.addLocation(tempLoc, e.getPlayer());
+                    AutoPickup.customItemPatch.put(key2, new PickupObjective(tempLoc, player, Instant.now()));
+                    break;
+                }
+                AutoPickup.customItemPatch.put(key2, new PickupObjective(tempLoc, player, Instant.now()));
+                //this.addLocation(tempLoc, e.getPlayer());
+            }
         }
 
     }

src/main/java/us/thezircon/play/autopickup/listeners/BlockDropItemEventListener.java

@@ -1,6 +1,7 @@
 package us.thezircon.play.autopickup.listeners;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.entity.Entity;
@@ -15,6 +16,7 @@
 import us.thezircon.play.autopickup.AutoPickup;
 import us.thezircon.play.autopickup.utils.AutoSmelt;
 
+import java.util.HashSet;
 import java.util.List;
 
 public class BlockDropItemEventListener implements Listener {

target/classes/plugin.yml

@@ -1,5 +1,5 @@
 name: AutoPickup
-version: 1.3.1-DEVBUILD.1
+version: 1.3.1-DEVBUILD.2
 main: us.thezircon.play.autopickup.AutoPickup
 prefix: AutoPickup
 authors: [BUTTERFIELD8]