Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2025-02-16 19:21:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix bug where auction buy now price during broadcast shows current price over actual purchase price

Browse Source 
Took 4 minutes
This commit is contained in:
Kiran Hart 2023-03-10 00:11:21 -05:00
parent f5cdca095d
commit ff0614a6b6
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ca/tweetzy/auctionhouse/guis/GUIPaymentCollection.java
View File

@ -20,6 +20,7 @@ package ca.tweetzy.auctionhouse.guis;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.api.hook.PlaceholderAPIHook;
import ca.tweetzy.auctionhouse.auction.AuctionPayment;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;
@ -79,7 +80,10 @@ public class GUIPaymentCollection extends AbstractPlaceholderGui {
});
setButton(5, 1, ConfigurationItemHelper.createConfigurationItem(Settings.GUI_PAYMENT_COLLECTION_ITEM.getString(), Settings.GUI_PAYMENT_COLLECTION_NAME.getString(), Settings.GUI_PAYMENT_COLLECTION_LORE.getStringList(), null), e -> {
setButton(5, 1, ConfigurationItemHelper.createConfigurationItem(
Settings.GUI_PAYMENT_COLLECTION_ITEM.getString(),
PlaceholderAPIHook.PAPIReplacer.tryReplace(this.player, Settings.GUI_PAYMENT_COLLECTION_NAME.getString()),
PlaceholderAPIHook.PAPIReplacer.tryReplace(this.player, Settings.GUI_PAYMENT_COLLECTION_LORE.getStringList()), null), e -> {
if (this.lastClicked == null) {
this.lastClicked = System.currentTimeMillis() + Settings.CLAIM_MS_DELAY.getInt();
@ -104,8 +108,8 @@ public class GUIPaymentCollection extends AbstractPlaceholderGui {
setButton(slot++, QuickItem
.of(Settings.GUI_PAYMENT_COLLECTION_PAYMENT_ITEM.getString())
.name(Settings.GUI_PAYMENT_COLLECTION_PAYMENT_NAME.getString().replace("%payment_amount%", AuctionAPI.getInstance().formatNumber(auctionPayment.getAmount())))
.lore(Settings.GUI_PAYMENT_COLLECTION_PAYMENT_LORE.getStringList())
.name(PlaceholderAPIHook.PAPIReplacer.tryReplace(this.player, Settings.GUI_PAYMENT_COLLECTION_PAYMENT_NAME.getString().replace("%payment_amount%", AuctionAPI.getInstance().formatNumber(auctionPayment.getAmount()))))
.lore(PlaceholderAPIHook.PAPIReplacer.tryReplace(this.player, Settings.GUI_PAYMENT_COLLECTION_PAYMENT_LORE.getStringList()))
.make(), ClickType.LEFT, e -> {
if (this.lastClicked == null) {

2
src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIConfirmPurchase.java
View File

@ -207,7 +207,7 @@ public class GUIConfirmPurchase extends AbstractPlaceholderGui {
.processPlaceholder("seller_displayname", AuctionAPI.getInstance().getDisplayName(seller))
.processPlaceholder("amount", auctionItem.getItem().getAmount())
.processPlaceholder("item", AuctionAPI.getInstance().getItemName(auctionItem.getItem()))
.processPlaceholder("price", AuctionAPI.getInstance().formatNumber(auctionItem.getCurrentPrice()))
.processPlaceholder("price", AuctionAPI.getInstance().formatNumber(Math.max(auctionItem.getBasePrice(), auctionItem.getCurrentPrice())))
.sendPrefixedMessage(player));
}