Merge remote-tracking branch 'origin/master'

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/util/Util.java

@@ -68,7 +68,6 @@
 import java.util.AbstractMap.SimpleEntry;
 import java.util.*;
 import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -86,7 +85,7 @@ public class Util {
     private static final ThreadLocal<MineDown> mineDown = ThreadLocal.withInitial(() -> new MineDown(""));
     private static int bypassedCustomStackSize = -1;
     private static Yaml yaml = null;
-    private static AtomicBoolean devMode = null;
+    private static Boolean devMode = null;
     @Setter
     private static QuickShop plugin;
     private static Object serverInstance;
@@ -332,10 +331,7 @@ public static void debugLog(@NotNull String... logs) {
         if (debugLogs.size() >= 2000) {
             debugLogs.clear();
         }
-        if(devMode == null){ //Workaround: Initial it if devMode not set while call this method
-            devMode = new AtomicBoolean(plugin.getConfig().getBoolean("dev-mode"));
-        }
-        if (!devMode.get()) {
+        if (!isDevMode()) {
             for (String log : logs) {
                 debugLogs.add("[DEBUG] " + log);
             }
@@ -626,7 +622,7 @@ public static void initialize() {
         restrictedPrices.clear();
         customStackSize.clear();
         currency2Symbol.clear();
-        devMode = new AtomicBoolean(plugin.getConfig().getBoolean("dev-mode"));
+        devMode = plugin.getConfig().getBoolean("dev-mode");
 
         for (String s : plugin.getConfig().getStringList("shop-blocks")) {
             Material mat = Material.matchMaterial(s.toUpperCase());
@@ -1293,9 +1289,7 @@ public static List<String> getStartupFlags() {
      * @return under dev-mode
      */
     public static boolean isDevMode() {
-        if(devMode == null)
-            return false;
-        return devMode.get();
+        return devMode != null ? devMode : (devMode = plugin.getConfig().getBoolean("dev-mode"));
     }
 
     /**