From 0b39fd1a5e04561a62969356343a407d7790c6bc Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Fri, 19 Jun 2020 18:58:00 +0100 Subject: [PATCH] Make auto-fill check both buy and sell permission separately (#325) Also slightly changes how the auto fill message is sent to not send two messages (autofill and no-permission) --- .../Listeners/PreShopCreation/ErrorMessageSender.java | 3 +++ .../ChestShop/Listeners/PreShopCreation/ItemChecker.java | 1 - .../ChestShop/Listeners/PreShopCreation/PermissionChecker.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ErrorMessageSender.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ErrorMessageSender.java index 751c995..80ef17b 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ErrorMessageSender.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ErrorMessageSender.java @@ -62,6 +62,9 @@ public class ErrorMessageSender implements Listener { case NOT_ENOUGH_MONEY: message = Messages.NOT_ENOUGH_MONEY; break; + case ITEM_AUTOFILL: + message = Messages.CLICK_TO_AUTOFILL_ITEM; + break; default: break; } diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ItemChecker.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ItemChecker.java index c587a37..8e51f27 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ItemChecker.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/ItemChecker.java @@ -52,7 +52,6 @@ public class ItemChecker implements Listener { if (item == null) { event.setSignLine(ITEM_LINE, ChatColor.BOLD + ChestShopSign.AUTOFILL_CODE); event.setOutcome(ITEM_AUTOFILL); - event.getPlayer().sendMessage(Messages.prefix(Messages.CLICK_TO_AUTOFILL_ITEM)); return; } } else { diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/PermissionChecker.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/PermissionChecker.java index 0239cd5..295109d 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/PermissionChecker.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/PermissionChecker.java @@ -35,7 +35,8 @@ public class PermissionChecker implements Listener { ItemStack item = parseEvent.getItem(); if (item == null) { - if (!Permission.has(player, SHOP_CREATION)) { + if ((PriceUtil.hasBuyPrice(priceLine) && !Permission.has(player, SHOP_CREATION_BUY)) + || (PriceUtil.hasSellPrice(priceLine) && !Permission.has(player, SHOP_CREATION_SELL))) { event.setOutcome(NO_PERMISSION); } return;