From 793eb311ac2f2e68b1236021c5d2bfb864a6723b Mon Sep 17 00:00:00 2001 From: YuanYuanOwO Date: Wed, 24 Dec 2025 18:22:32 +0800 Subject: [PATCH 1/4] fix ui with supertool --- .../quickshop/shop/interaction/behaviors/ControlPanelUI.java | 4 ++++ .../quickshop/shop/interaction/behaviors/TradeUI.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/ControlPanelUI.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/ControlPanelUI.java index d66dd8228c..dbf1e702ea 100644 --- a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/ControlPanelUI.java +++ b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/ControlPanelUI.java @@ -28,6 +28,7 @@ import net.tnemc.menu.core.compatibility.MenuPlayer; import net.tnemc.menu.core.manager.MenuManager; import net.tnemc.menu.core.viewer.MenuViewer; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.player.PlayerInteractEvent; @@ -90,6 +91,9 @@ public void handle(final @NotNull QuickShopAPI plugin, final @Nullable Shop shop return; } + if(event.getPlayer().getInventory().getItemInMainHand().getType() == Material.GOLDEN_AXE) { + return; + } MenuManager.instance().addViewer(viewer); diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/TradeUI.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/TradeUI.java index cd7b7287d7..72c5facfe6 100644 --- a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/TradeUI.java +++ b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/interaction/behaviors/TradeUI.java @@ -28,6 +28,7 @@ import net.tnemc.menu.core.compatibility.MenuPlayer; import net.tnemc.menu.core.manager.MenuManager; import net.tnemc.menu.core.viewer.MenuViewer; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.player.PlayerInteractEvent; @@ -82,6 +83,10 @@ public void handle(final @NotNull QuickShopAPI plugin, final @Nullable Shop shop return; } + if(event.getPlayer().getInventory().getItemInMainHand().getType() == Material.GOLDEN_AXE) { + return; + } + final MenuViewer viewer = new MenuViewer(event.getPlayer().getUniqueId()); viewer.addData(ShopKeeperMenu.SHOP_DATA_ID, shop.getShopId()); MenuManager.instance().addViewer(viewer); From 6339fdda99f900d58d8723ca96ddf2d14ba58a3d Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Fri, 26 Dec 2025 14:42:01 +0800 Subject: [PATCH 2/4] Update pom.xml Revert "Update pom.xml" This reverts commit 548245e686a944716f031e1a72e1aac336505aad. fix permission fix the permission check issue --- .../command/subcommand/SubCommand_TransferOwnership.java | 3 ++- quickshop-bukkit/src/main/resources/plugin.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_TransferOwnership.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_TransferOwnership.java index 84485b28b6..e06658220e 100644 --- a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_TransferOwnership.java +++ b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_TransferOwnership.java @@ -77,7 +77,8 @@ public void onCommand(@NotNull final Player sender, @NotNull final String comman plugin.text().of(sender, "not-looking-at-shop").send(); return; } - if(!targetShop.playerAuthorize(sender.getUniqueId(), BuiltInShopPermission.OWNERSHIP_TRANSFER)) { + if (!targetShop.playerAuthorize(sender.getUniqueId(), BuiltInShopPermission.OWNERSHIP_TRANSFER) + && !plugin.perm().hasPermission(sender, "quickshop.transferownership.other")) { plugin.text().of(sender, "no-permission").send(); return; } diff --git a/quickshop-bukkit/src/main/resources/plugin.yml b/quickshop-bukkit/src/main/resources/plugin.yml index d5c9eb63c5..c040f51509 100644 --- a/quickshop-bukkit/src/main/resources/plugin.yml +++ b/quickshop-bukkit/src/main/resources/plugin.yml @@ -152,7 +152,7 @@ permissions: quickshop.alerts: true quickshop.create.admin: true quickshop.history.*: true - quickshop.transferownershop.other: true + quickshop.transferownership: true quickshop.other.changeitem: true quickshop.other.changeamount: true quickshop.other.staff: true From c0f660fc4e55fe7f649d6dda03cc4b347d478c0d Mon Sep 17 00:00:00 2001 From: YuanYuanOwO Date: Fri, 26 Dec 2025 21:53:02 +0800 Subject: [PATCH 3/4] fix typo --- quickshop-bukkit/src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickshop-bukkit/src/main/resources/plugin.yml b/quickshop-bukkit/src/main/resources/plugin.yml index c040f51509..6797583530 100644 --- a/quickshop-bukkit/src/main/resources/plugin.yml +++ b/quickshop-bukkit/src/main/resources/plugin.yml @@ -152,7 +152,7 @@ permissions: quickshop.alerts: true quickshop.create.admin: true quickshop.history.*: true - quickshop.transferownership: true + quickshop.transferownership.other: true quickshop.other.changeitem: true quickshop.other.changeamount: true quickshop.other.staff: true From fe113a319b0773b73d7b23977a5bc9d490501d52 Mon Sep 17 00:00:00 2001 From: YuanYuanOwO <81153017+YuanYuanOwO@users.noreply.github.com> Date: Mon, 29 Dec 2025 22:09:53 +0800 Subject: [PATCH 4/4] fix /qs benefit tabcomptele (#8) --- .../quickshop/command/subcommand/SubCommand_Benefit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_Benefit.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_Benefit.java index a14816dfd1..7bc3d2b52d 100644 --- a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_Benefit.java +++ b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/command/subcommand/SubCommand_Benefit.java @@ -207,7 +207,7 @@ public List onTabComplete( @NotNull final Player sender, @NotNull final String commandLabel, @NotNull final CommandParser parser) { if(parser.getArgs().size() == 1) { - return List.of("add", "remove"); + return List.of("add", "remove", "query"); } if(parser.getArgs().size() == 2) { return null;