Bugs & World Blacklist

Author: MrButtersDEV

pom.xml

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

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

@@ -27,6 +27,7 @@ public final class AutoPickup extends JavaPlugin {
     public TallCrops crops;
 
     public static boolean usingUpgradableHoppers = false; // UpgradableHoppers Patch
+    public static ArrayList<String> worldsBlacklist;
 
     @Override
     public void onEnable() {
@@ -75,6 +76,11 @@ public void run() {
                 }
             }
         }.run();
+
+        // Worlds blacklist
+        if (getBlacklistConf().contains("BlacklistedWorlds")) {
+            worldsBlacklist = (ArrayList<String>) getBlacklistConf().getList("BlacklistedWorlds");
+        }
     }
 
     @Override

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

@@ -35,6 +35,10 @@ public void onBreak(BlockBreakEvent e) {
         boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklisted");
         List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("Blacklisted");
 
+        if (AutoPickup.worldsBlacklist.contains(loc.getWorld().getName())) {
+            return;
+        }
+
         if (!PLUGIN.autopickup_list.contains(player)) {
             return;
         }

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

@@ -1,5 +1,6 @@
 package us.thezircon.play.autopickup.listeners;
 
+import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.entity.Entity;
@@ -27,6 +28,11 @@ public void onDrop(BlockDropItemEvent e) {
         boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklisted");
         List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("Blacklisted");
 
+        Location loc = block.getLocation();
+        if (AutoPickup.worldsBlacklist.contains(loc.getWorld().getName())) {
+            return;
+        }
+
         if (block.getState() instanceof Container) {
             return; // Containers are handled in block break event
         }

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

@@ -1,5 +1,6 @@
 package us.thezircon.play.autopickup.listeners;
 
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -19,6 +20,11 @@ public void onDeath(EntityDeathEvent e) {
         Player player = e.getEntity().getKiller();
         boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
 
+        Location loc = player.getLocation();
+        if (AutoPickup.worldsBlacklist.contains(loc.getWorld().getName())) {
+            return;
+        }
+
         if (PLUGIN.getBlacklistConf().contains("BlacklistedEntities", true)) {
             boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklistedEntities");
             List<String> blacklist = PLUGIN.getBlacklistConf().getStringList("BlacklistedEntities");

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

@@ -22,8 +22,13 @@ public class PlayerInteractEventListener implements Listener {
     @EventHandler
     public void onClick(PlayerInteractEvent e) {
         Player player = e.getPlayer();
+        if (!PLUGIN.autopickup_list.contains(player) || (e.getAction().equals(Action.LEFT_CLICK_AIR) || e.getAction().equals(Action.RIGHT_CLICK_AIR))) {
+            return;
+        }
+
         Location loc = e.getClickedBlock().getLocation();
-        if (!PLUGIN.autopickup_list.contains(player)) {
+
+        if (AutoPickup.worldsBlacklist.contains(loc.getWorld().getName())) {
             return;
         }
 

src/main/resources/blacklist.yml

@@ -25,3 +25,6 @@ Blacklisted:
 
 BlacklistedEntities:
   - PLAYER
+
+BlacklistedWorlds:
+  - example

target/classes/blacklist.yml

@@ -25,3 +25,6 @@ Blacklisted:
 
 BlacklistedEntities:
   - PLAYER
+
+BlacklistedWorlds:
+  - example

target/classes/plugin.yml

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