Ađ auto tr...

VoChiDanh · Jun 14, 2022 · 5102708 · 5102708
1 parent 0e52009
commit 5102708
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/net/danh/storage/Events/BlockBreak.java b/src/main/java/net/danh/storage/Events/BlockBreak.java
@@ -4,6 +4,7 @@
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.jetbrains.annotations.NotNull;
@@ -53,7 +54,7 @@ public static void fortune(BlockBreakEvent e, Player p, String blocks, int level
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBreaking(@NotNull BlockBreakEvent e) {
         Player p = e.getPlayer();
         String blocks = e.getBlock().getType().toString();
@@ -69,7 +70,6 @@ public void onBreaking(@NotNull BlockBreakEvent e) {
                 blocks = e.getBlock().getType().toString();
             }
         }
-        if (e.isCancelled()) return;
         List<String> w = getconfigfile().getStringList("Blacklist-World");
         if (!w.contains(p.getWorld().getName())) {
             if (autoPick(p)) {

diff --git a/src/main/java/net/danh/storage/Events/Join.java b/src/main/java/net/danh/storage/Events/Join.java
@@ -1,13 +1,15 @@
 package net.danh.storage.Events;
 
 import net.danh.storage.Manager.Data;
+import net.danh.storage.Manager.Files;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +20,8 @@ public class Join implements Listener {
     @EventHandler
     public void onJoin(@NotNull PlayerJoinEvent e) {
         Player p = e.getPlayer();
-        setautoSmelt(p, autoSmeltData(p));
-        setautoPick(p, autoPickData(p));
+        setautoSmelt(p, Files.getconfigfile().getBoolean("Auto.Smelt"));
+        setautoPick(p, Files.getconfigfile().getBoolean("Auto.Pickup"));
         for (String item : Objects.requireNonNull(getconfigfile().getConfigurationSection("Blocks.")).getKeys(false)) {
             Data.setMaxStorage(p, item, getMaxStorageData(p, item));
             Data.setStorage(p, item, getStorageData(p, item));
@@ -29,7 +31,7 @@ public void onJoin(@NotNull PlayerJoinEvent e) {
                 addPlayers(p);
             }
         } else {
-            List<String> ps = Arrays.asList(p.getName());
+            List<String> ps = Collections.singletonList(p.getName());
             getdatafile().set("All_players", ps);
             savedata();
         }

diff --git a/src/main/resources/config-legacy.yml b/src/main/resources/config-legacy.yml
@@ -4,6 +4,9 @@ Blacklist-World:
 VERSION: 1.0-B7
 Vanilla_Drops: true
 Tool_Sensitive: false
+Auto:
+  Smell: false
+  Pickup: true
 Number_Format: '#.###'
 Input:
   # AGAIN

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -4,6 +4,9 @@ Blacklist-World:
 VERSION: 1.0-B7
 Vanilla_Drops: true
 Tool_Sensitive: false
+Auto:
+  Smell: false
+  Pickup: true
 Number_Format: '#.###'
 Input:
   # AGAIN