From bf5803f34240ae68ec3fbafc156115163814cd75 Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Sun, 30 Jul 2023 18:21:49 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=B2=20fix=20bug=20where=20players=20ca?= =?UTF-8?q?n=20still=20cancel=20items=20with=20bids=20on=20them=20using=20?= =?UTF-8?q?the=20end=20all=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took 4 minutes --- .../ca/tweetzy/auctionhouse/auction/AuctionedItem.java | 4 ++++ .../ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java b/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java index d659081..15a3133 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java +++ b/src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java @@ -232,4 +232,8 @@ public class AuctionedItem { itemStack.setItemMeta(meta); return itemStack; } + + public boolean containsValidBid() { + return isBidItem() && !this.highestBidder.equals(this.owner); + } } diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java index 0e8b932..56f7cb0 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/GUIActiveAuctions.java @@ -152,7 +152,13 @@ public class GUIActiveAuctions extends AbstractPlaceholderGui { setButton(5, 4, getRefreshButtonItem(), e -> e.manager.showGUI(e.player, new GUIActiveAuctions(this.auctionPlayer))); setButton(5, 1, ConfigurationItemHelper.createConfigurationItem(this.player, Settings.GUI_ACTIVE_AUCTIONS_ITEM.getString(), Settings.GUI_ACTIVE_AUCTIONS_NAME.getString(), Settings.GUI_ACTIVE_AUCTIONS_LORE.getStringList(), null), e -> { - this.auctionPlayer.getItems(false).forEach(item -> item.setExpired(true)); + for (AuctionedItem item : this.auctionPlayer.getItems(false)) { + if (Settings.SELLERS_MUST_WAIT_FOR_TIME_LIMIT_AFTER_BID.getBoolean() && item.containsValidBid()) + continue; + + item.setExpired(true); + } + draw(); }); }