RoseStacker duplication patch

Author: MrButtersDEV

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

@@ -131,11 +131,6 @@ public void run() {
             }
         }.runTaskLater(PLUGIN, 1);
 
-        ///////////////////////////////////// Custom items \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
-        String key = loc.getBlockX()+";"+loc.getBlockY()+";"+loc.getBlockZ()+";"+loc.getWorld();
-        AutoPickup.customItemPatch.put(key, new PickupObjective(loc, player, Instant.now()));
-        ///////////////////////////////////////////////////////////////////////////////////////
-
         // Mend Items & Give Player XP
         int xp = e.getExpToDrop();
         player.giveExp(xp); // Give player XP
@@ -268,8 +263,14 @@ public void run() {
 //                }
 //            }
 
+            return;
         }
 
+        ///////////////////////////////////// Custom items \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+        String key = loc.getBlockX()+";"+loc.getBlockY()+";"+loc.getBlockZ()+";"+loc.getWorld();
+        AutoPickup.customItemPatch.put(key, new PickupObjective(loc, player, Instant.now()));
+        ///////////////////////////////////////////////////////////////////////////////////////
+
         TallCrops crops = PLUGIN.getCrops();
         ArrayList<Material> verticalReq = crops.getVerticalReq();
         ArrayList<Material> verticalReqDown = crops.getVerticalReqDown();

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

@@ -3,6 +3,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -19,7 +20,7 @@ public class ItemSpawnEventListener implements Listener {
 
     ///////////////////////////////////// Custom items \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onSpawn(ItemSpawnEvent e) {
         boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklisted");
         List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("Blacklisted");