fix: /qs supercreate can't bypass the protection checks

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/api/shop/Info.java

@@ -1,3 +1,22 @@
+/*
+ * This file is a part of project QuickShop, the name is Info.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package org.maxgamer.quickshop.api.shop;
 
 import org.bukkit.Location;
@@ -40,4 +59,11 @@ public interface Info {
      */
     boolean hasChanged(@NotNull Shop shop);
 
+    /**
+     * Check if this Info marked as skip protection checks
+     *
+     * @return Bypassed Protection Checks
+     */
+    boolean isBypassed();
+
 }

src/main/java/org/maxgamer/quickshop/api/shop/ShopManager.java

@@ -156,7 +156,7 @@ public interface ShopManager {
 
     void handleChat(@NotNull Player p, @NotNull String msg);
 
-    void handleChat(@NotNull Player p, @NotNull String msg, boolean bypassProtectionChecks);
+ //   void handleChat(@NotNull Player p, @NotNull String msg, boolean bypassProtectionChecks);
 
     /**
      * Load shop method for loading shop into mapping, so getShops method will can find it. It also

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Create.java

@@ -148,7 +148,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
 
             // Send creation menu.
             plugin.getShopManager().getActions().put(sender.getUniqueId(),
-                    new SimpleInfo(b.getLocation(), ShopAction.CREATE, item, b.getRelative(sender.getFacing().getOppositeFace())));
+                    new SimpleInfo(b.getLocation(), ShopAction.CREATE, item, b.getRelative(sender.getFacing().getOppositeFace()), false));
             plugin.getShopManager().handleChat(sender, price);
             return;
         }

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java

@@ -58,12 +58,12 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                 continue;
             }
 
-            if (cmdArg.length >= 1) {
-                plugin.getShopManager().handleChat(sender, cmdArg[0], true);
-                return;
-            }
+//            if (cmdArg.length >= 1) {
+//                plugin.getShopManager().handleChat(sender, cmdArg[0], true);
+//                return;
+//            }
             // Send creation menu.
-            final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()));
+            final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()), true);
 
             plugin.getShopManager().getActions().put(sender.getUniqueId(), info);
             plugin.text().of(sender, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(info.getItem().getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();

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

@@ -234,7 +234,7 @@ private void postTrade(PlayerInteractEvent e) {
             }
             // Add the new action
             Map<UUID, Info> actions = plugin.getShopManager().getActions();
-            Info info = new SimpleInfo(shop.getLocation(), ShopAction.BUY, null, null, shop);
+            Info info = new SimpleInfo(shop.getLocation(), ShopAction.BUY, null, null, shop, false);
             actions.put(p.getUniqueId(), info);
         }
         // Handles creating shops
@@ -287,7 +287,7 @@ else if (e.useInteractedBlock() == Event.Result.ALLOW
                 last = n;
             }
             // Send creation menu.
-            final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last);
+            final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last, false);
 
             plugin.getShopManager().getActions().put(p.getUniqueId(), info);
             plugin.text().of(p, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(Objects.requireNonNull(e.getItem()).getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();

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

@@ -39,6 +39,7 @@ public class SimpleInfo implements Info {
     private final Block last;
     private final Location loc;
     private final boolean dirty;
+    private final boolean bypass;
     private ShopAction action;
     private ItemStack item;
     private Shop shop;
@@ -47,25 +48,30 @@ public SimpleInfo(
             @NotNull Location loc,
             @NotNull ShopAction action,
             @Nullable ItemStack item,
-            @Nullable Block last) {
+            @Nullable Block last,
+            boolean bypass) {
         this.loc = loc;
         this.action = action;
         this.last = last;
+        this.bypass = bypass;
         if (item != null) {
             this.item = item.clone();
         }
         this.dirty = true;
     }
 
+
     public SimpleInfo(
             @NotNull Location loc,
             @NotNull ShopAction action,
             @Nullable ItemStack item,
             @Nullable Block last,
-            @Nullable Shop shop) {
+            @Nullable Shop shop,
+            boolean bypass) {
         this.loc = loc;
         this.action = action;
         this.last = last;
+        this.bypass = bypass;
         if (item != null) {
             this.item = item.clone();
         }
@@ -148,4 +154,9 @@ public boolean hasChanged(@NotNull Shop shop) {
         return !this.shop.matches(shop.getItem());
     }
 
+    @Override
+    public boolean isBypassed() {
+        return bypass;
+    }
+
 }

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

@@ -515,11 +515,6 @@ public Shop getShopFromRuntimeRandomUniqueId(
 
     @Override
     public void handleChat(@NotNull Player p, @NotNull String msg) {
-        handleChat(p, msg, false);
-    }
-
-    @Override
-    public void handleChat(@NotNull Player p, @NotNull String msg, boolean bypassProtectionChecks) {
         if (!plugin.getShopManager().getActions().containsKey(p.getUniqueId())) {
             return;
         }
@@ -544,7 +539,7 @@ public void handleChat(@NotNull Player p, @NotNull String msg, boolean bypassPro
                 return;
             }
             if (info.getAction() == ShopAction.CREATE) {
-                actionCreate(p, info, finalMessage, bypassProtectionChecks);
+                actionCreate(p, info, finalMessage);
             }
             if (info.getAction() == ShopAction.BUY) {
                 actionTrade(p, info, finalMessage);
@@ -844,8 +839,7 @@ public double getTax(@NotNull Shop shop, @NotNull UUID p) {
         return taxEvent.getTax();
     }
 
-    public void actionCreate(@NotNull Player p, Info info, @NotNull String message,
-                             boolean bypassProtectionChecks) {
+    public void actionCreate(@NotNull Player p, Info info, @NotNull String message) {
         Util.ensureThread(false);
         if (plugin.getEconomy() == null) {
             MsgUtil.sendDirectMessage(p, "Error: Economy system not loaded, type /qs main command to get details.");
@@ -859,7 +853,7 @@ public void actionCreate(@NotNull Player p, Info info, @NotNull String message,
         // Checking the shop can be created
         Util.debugLog("Calling for protection check...");
         // Fix openInv compatible issue
-        if (!bypassProtectionChecks) {
+        if (!info.isBypassed()) {
             Result result = plugin.getPermissionChecker().canBuild(p, info.getLocation());
             if (!result.isSuccess()) {
                 plugin.text().of(p, "3rd-plugin-build-check-failed", result.getMessage()).send();
@@ -979,7 +973,7 @@ public void actionCreate(@NotNull Player p, Info info, @NotNull String message,
                 null,
                 false,
                 null);
-        if (!bypassProtectionChecks) {
+        if (!info.isBypassed()) {
             Result result = ((SimpleIntegrationManager) plugin.getIntegrationHelper()).callIntegrationsCanCreate(p, info.getLocation());
             if (!result.isSuccess()) {
                 plugin.text().of(p, "integrations-check-failed-create", result.getMessage()).send();