Merge remote-tracking branch 'origin/master'

Former-commit-id: 6866d2a

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -587,7 +587,7 @@ public void onEnable() {
         /* Process the config */
         saveDefaultConfig();
         reloadConfig();
-        getConfig().options().copyDefaults(true); // Load defaults.
+        getConfig().options().copyDefaults(true).header("Read the example.config.yml file to get commented example config file."); // Load defaults.
         saveDefaultConfig();
         reloadConfig();
         // getConfig().options().copyDefaults(true);

src/main/java/org/maxgamer/quickshop/listener/BlockListener.java

@@ -54,7 +54,7 @@ public BlockListener(@NotNull final QuickShop plugin, @Nullable final Cache cach
     /*
      * Removes chests when they're destroyed.
      */
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.NORMAL,ignoreCancelled = true)
     public void onBreak(BlockBreakEvent e) {
 
         final Block b = e.getBlock();
@@ -102,12 +102,7 @@ public void onBreak(BlockBreakEvent e) {
                 return;
             }
 
-            if (!shop.getModerator().isOwner(p.getUniqueId())
-                    && !QuickShop.getPermissionManager().hasPermission(p, "quickshop.other.destroy")) {
-                e.setCancelled(true);
-                MsgUtil.sendMessage(p, MsgUtil.getMessage("no-permission", p));
-                return;
-            }
+
             // Cancel their current menu... Doesnt cancel other's menu's.
             final Info action = super.getPlugin().getShopManager().getActions().get(p.getUniqueId());
 

src/main/resources/config.yml

@@ -38,7 +38,7 @@ config-version: 106
 #zh-CN
 #zh-TW
 
-language: en
+language: en-US
 
 #After you setup this, quickshop will download items/blocks/enchs and potions translation from MOJANGAPI
 #You can find supported language in your Minecraft Client Languages menu, fill this with the language Code.