From 7294672acb4f4f260d23a44f506608bbcffc337b Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 17 Jul 2021 10:18:38 +0200 Subject: [PATCH] Possible fix for sell -1 popping up when buying --- .../xyz/mackan/Slabbo/GUI/ShopUserGUI.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopUserGUI.java b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopUserGUI.java index f00f8884..848634a1 100644 --- a/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopUserGUI.java +++ b/modules/Plugin/src/main/java/xyz/mackan/Slabbo/GUI/ShopUserGUI.java @@ -223,12 +223,20 @@ public void handleBuy (HumanEntity humanEntity) { shop.commandList.executeBuyCommands(replacementMap); } - if (isLimitedShop) { - inv.setItem(0, GUIItems.getUserBuyItem(NameUtil.getName(shop.item), shop.quantity, shop.buyPrice, shop.shopLimit.buyStockLeft, shop.admin, isLimitedShop)); - inv.setItem(1, GUIItems.getUserSellItem(NameUtil.getName(shop.item), shop.quantity, shop.sellPrice, shop.shopLimit.sellStockLeft, shop.admin, isLimitedShop)); - } else { - inv.setItem(0, GUIItems.getUserBuyItem(NameUtil.getName(shop.item), shop.quantity, shop.buyPrice, shop.stock, shop.admin, isLimitedShop)); - inv.setItem(1, GUIItems.getUserSellItem(NameUtil.getName(shop.item), shop.quantity, shop.sellPrice, shop.stock, shop.admin, isLimitedShop)); + if (shop.buyPrice > -1 && shop.quantity > 0) { + if (isLimitedShop) { + inv.setItem(0, GUIItems.getUserBuyItem(NameUtil.getName(shop.item), shop.quantity, shop.buyPrice, shop.shopLimit.buyStockLeft, shop.admin, isLimitedShop)); + } else { + inv.setItem(0, GUIItems.getUserBuyItem(NameUtil.getName(shop.item), shop.quantity, shop.buyPrice, shop.stock, shop.admin, isLimitedShop)); + } + } + + if (shop.sellPrice > -1 && shop.quantity > 0) { + if (isLimitedShop) { + inv.setItem(1, GUIItems.getUserSellItem(NameUtil.getName(shop.item), shop.quantity, shop.sellPrice, shop.shopLimit.sellStockLeft, shop.admin, isLimitedShop)); + } else { + inv.setItem(1, GUIItems.getUserSellItem(NameUtil.getName(shop.item), shop.quantity, shop.sellPrice, shop.stock, shop.admin, isLimitedShop)); + } } inv.setItem(7, GUIItems.getUserFundsItem(Slabbo.getEconomy().getBalance((OfflinePlayer)humanEntity)));