Clarify message

Former-commit-id: b37b3be
Ghost-chu · Mar 7, 2020 · 19a5af6 · 19a5af6
1 parent ea59893
commit 19a5af6
Show file tree

Hide file tree

Showing 5 changed files with 251 additions and 243 deletions.
diff --git a/src/main/java/org/maxgamer/quickshop/Command/SubCommands/SubCommand_Buy.java b/src/main/java/org/maxgamer/quickshop/Command/SubCommands/SubCommand_Buy.java
@@ -57,14 +57,17 @@ public void onCommand(
             final Block b = bIt.next();
             final Shop shop = plugin.getShopManager().getShop(b.getLocation());
 
-            if (shop != null && shop.getModerator().isModerator(((Player) sender).getUniqueId())) {
-                shop.setShopType(ShopType.BUYING);
-                // shop.setSignText();
-                shop.update();
-                sender.sendMessage(
-                    MsgUtil.getMessage(
-                        "command.now-buying", sender, Util.getItemStackName(shop.getItem())));
-                return;
+            if (shop != null) {
+                if (shop.getModerator().isModerator(((Player) sender).getUniqueId())) {
+                    shop.setShopType(ShopType.BUYING);
+                    // shop.setSignText();
+                    shop.update();
+                    sender.sendMessage(MsgUtil.getMessage("command.now-buying", sender, Util.getItemStackName(shop.getItem())));
+                    return;
+                } else {
+                    MsgUtil.getMessage("not-managed-shop", sender);
+                    return;
+                }
             }
         }
 

diff --git a/src/main/java/org/maxgamer/quickshop/Listeners/BlockListener.java b/src/main/java/org/maxgamer/quickshop/Listeners/BlockListener.java
@@ -205,8 +205,8 @@ public void onPlace(BlockPlaceEvent e) {
         Block chest = null;
         //Chest combine mechanic based checking
         if (player.isSneaking()) {
-            Block blockAgainst=e.getBlockAgainst();
-            if (blockAgainst.getType() == Material.CHEST &&placingBlock.getFace(blockAgainst)!=BlockFace.UP&&placingBlock.getFace(blockAgainst)!=BlockFace.DOWN&&!(((Chest)blockAgainst.getState()).getInventory() instanceof DoubleChestInventory)) {
+            Block blockAgainst = e.getBlockAgainst();
+            if (blockAgainst.getType() == Material.CHEST && placingBlock.getFace(blockAgainst) != BlockFace.UP && placingBlock.getFace(blockAgainst) != BlockFace.DOWN && !(((Chest) blockAgainst.getState()).getInventory() instanceof DoubleChestInventory)) {
                 chest = e.getBlockAgainst();
             } else {
                 return;
@@ -244,9 +244,10 @@ public void onPlace(BlockPlaceEvent e) {
             if (!QuickShop.getPermissionManager().hasPermission(player, "quickshop.create.double")) {
                 e.setCancelled(true);
                 player.sendMessage(MsgUtil.getMessage("no-double-chests", player));
-            } else if (!shop.getOwner().equals(player.getUniqueId())) {
+
+            } else if (!shop.getModerator().isModerator(player.getUniqueId())) {
                 e.setCancelled(true);
-                player.sendMessage(MsgUtil.getMessage("that-is-locked", player));
+                player.sendMessage(MsgUtil.getMessage("not-managed-shop", player));
             }
         }
     }