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);