From 4ccf0e0df6a71facc0523bba7a0ed5239ed9d7f0 Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Fri, 20 May 2022 14:02:03 -0400 Subject: [PATCH] partial buy skips initial bal check, checks during actual purchase confirmation Took 6 minutes --- .../ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java | 10 +++++----- .../guis/transaction/GUITransactionView.java | 1 + .../ca/tweetzy/auctionhouse/settings/Settings.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java index 4d2c868..22aa879 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java @@ -22,7 +22,6 @@ import ca.tweetzy.auctionhouse.managers.SoundManager; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.compatibility.ServerVersion; import ca.tweetzy.core.compatibility.XMaterial; -import ca.tweetzy.core.gui.Gui; import ca.tweetzy.core.gui.events.GuiClickEvent; import ca.tweetzy.core.hooks.EconomyManager; import ca.tweetzy.core.input.PlayerChatInput; @@ -182,10 +181,11 @@ public class GUIAuctionHouse extends AbstractPlaceholderGui { return; } - if (!EconomyManager.hasBalance(e.player, auctionItem.getBasePrice())) { - AuctionHouse.getInstance().getLocale().getMessage("general.notenoughmoney").sendPrefixedMessage(e.player); - return; - } + if (!buyingQuantity) + if (!EconomyManager.hasBalance(e.player, auctionItem.getBasePrice())) { + AuctionHouse.getInstance().getLocale().getMessage("general.notenoughmoney").sendPrefixedMessage(e.player); + return; + } if (buyingQuantity) { if (auctionItem.getBidStartingPrice() <= 0 || !Settings.ALLOW_USAGE_OF_BID_SYSTEM.getBoolean()) { diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java index 577d470..54273ec 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionView.java @@ -46,6 +46,7 @@ public class GUITransactionView extends AbstractPlaceholderGui { put("%sale_type%", transaction.getAuctionSaleType() == AuctionSaleType.USED_BIDDING_SYSTEM ? AuctionHouse.getInstance().getLocale().getMessage("transaction.sale_type.bid_won").getMessage() : AuctionHouse.getInstance().getLocale().getMessage("transaction.sale_type.immediate_buy").getMessage()); put("%transaction_date%", AuctionAPI.getInstance().convertMillisToDate(transaction.getTransactionTime())); put("%final_price%", AuctionAPI.getInstance().formatNumber(transaction.getFinalPrice())); + put("%item_name%", AuctionAPI.getInstance().getItemName(transaction.getItem())); }})); } } diff --git a/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java b/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java index 9342594..1140306 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java +++ b/src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java @@ -620,7 +620,6 @@ public class Settings { public static final ConfigSetting GUI_TRANSACTIONS_TITLE = new ConfigSetting(config, "gui.transactions.title", "&7&LYour Transactions"); public static final ConfigSetting GUI_TRANSACTIONS_TITLE_ALL = new ConfigSetting(config, "gui.transactions.title all", "&7&LAll Transactions"); - public static final ConfigSetting GUI_TRANSACTIONS_ITEM_TRANSACTION_ITEM = new ConfigSetting(config, "gui.transactions.items.transaction.item", "PAPER"); public static final ConfigSetting GUI_TRANSACTIONS_ITEM_TRANSACTION_NAME = new ConfigSetting(config, "gui.transactions.items.transaction.name", "&e%transaction_id%"); public static final ConfigSetting GUI_TRANSACTIONS_ITEM_TRANSACTION_LORE = new ConfigSetting(config, "gui.transactions.items.transaction.lore", Arrays.asList( "&7Seller&F: &e%seller%", @@ -654,6 +653,7 @@ public class Settings { public static final ConfigSetting GUI_TRANSACTION_VIEW_ITEM_INFO_NAME = new ConfigSetting(config, "gui.transaction view.items.information.name", "&e%transaction_id%"); public static final ConfigSetting GUI_TRANSACTION_VIEW_ITEM_INFO_LORE = new ConfigSetting(config, "gui.transaction view.items.information.lore", Arrays.asList( "&7ID&f: &e%transaction_id%", + "&7Item name&F: %item_name%", "&7Sale Type&f: &e%sale_type%", "&7Date&f: &e%transaction_date%", "&7Final Price&f: &e%final_price%"