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

🪲 Fix regarding infinite items losing their original stack size. Possibly resolves #24, needs confirmation

Browse Source 
Took 4 minutes
This commit is contained in:
Kiran Hart 2023-02-26 18:30:54 -05:00
parent 6895ed8a89
commit dc0dd49560
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,14 +157,12 @@ public class GUIConfirmPurchase extends AbstractPlaceholderGui {
ItemStack item = auctionItem.getItem().clone(); ItemStack item = auctionItem.getItem().clone();
ItemStack toGive = auctionItem.getItem().clone(); ItemStack toGive = auctionItem.getItem().clone();
if (item.getAmount() - this.purchaseQuantity >= 1) { if (item.getAmount() - this.purchaseQuantity >= 1 && !located.isInfinite()) {
item.setAmount(item.getAmount() - this.purchaseQuantity); item.setAmount(item.getAmount() - this.purchaseQuantity);
toGive.setAmount(this.purchaseQuantity); toGive.setAmount(this.purchaseQuantity);
if (!located.isInfinite()) {
located.setItem(item); located.setItem(item);
located.setBasePrice(Settings.ROUND_ALL_PRICES.getBoolean() ? Math.round(located.getBasePrice() - buyNowPrice) : located.getBasePrice() - buyNowPrice); located.setBasePrice(Settings.ROUND_ALL_PRICES.getBoolean() ? Math.round(located.getBasePrice() - buyNowPrice) : located.getBasePrice() - buyNowPrice);
}
transferFunds(e.player, buyNowPrice); transferFunds(e.player, buyNowPrice);
} else { } else {
@ -209,12 +207,13 @@ public class GUIConfirmPurchase extends AbstractPlaceholderGui {
.sendPrefixedMessage(player)); .sendPrefixedMessage(player));
} }
AuctionHouse.getInstance().getTransactionManager().getPrePurchasePlayers(auctionItem.getId()).forEach(player -> { AuctionHouse.getInstance().getTransactionManager().getPrePurchasePlayers(auctionItem.getId()).forEach(player -> {
AuctionHouse.getInstance().getTransactionManager().removeAllRelatedPlayers(auctionItem.getId()); AuctionHouse.getInstance().getTransactionManager().removeAllRelatedPlayers(auctionItem.getId());
player.closeInventory(); player.closeInventory();
}); });
e.gui.close(); e.gui.close();
} catch (ItemNotFoundException exception) { } catch (ItemNotFoundException exception) {
AuctionHouse.getInstance().getLogger().info("Tried to purchase item that was bought, or does not exist"); AuctionHouse.getInstance().getLogger().info("Tried to purchase item that was bought, or does not exist");
} }