Merge pull request Ghost-chu#1546 from Ghost-chu/master

5.0.0.5

Author: Ghost-chu

pom.xml

@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.4</pluginver>
+        <pluginver>5.0.0.5</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java

@@ -193,7 +193,9 @@ private void applyOverrideConfiguration(@NotNull JsonConfiguration distributionC
             if ("language-version".equals(key) || "config-version".equals(key) || "version".equals(key)) {
                 continue;
             }
-            distributionConfiguration.set(key, distributionConfiguration.get(key));
+            Object content = overrideConfiguration.get(key);
+            Util.debugLog("Override key " + key + " with content: " + content);
+            distributionConfiguration.set(key, content);
         }
     }
 
@@ -234,9 +236,7 @@ private JsonConfiguration getOverrideConfiguration(@NotNull String overrideFile,
             localOverrideFile.getParentFile().mkdirs();
             localOverrideFile.createNewFile();
         }
-        JsonConfiguration configuration = new JsonConfiguration();
-        configuration.loadFromString(Util.readToString(localOverrideFile));
-        return configuration;
+        return JsonConfiguration.loadConfiguration(localOverrideFile);
     }
 
     /**

src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java

@@ -160,6 +160,7 @@ public void loadShops(@Nullable String worldName) {
             Bukkit.getScheduler().runTaskLater(plugin, () -> {
                 this.plugin.getLogger().info("Loading the shops in worlds...");
                 for (Shop shop : pendingLoadShops) {
+                    plugin.getShopManager().loadShop(shop.getLocation().getWorld().getName(), shop);
                     shop.onLoad();
                     shop.update();
                 }