Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2024-11-25 05:55:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

2.26.1

Browse Source
This commit is contained in:
Kiran Hart 2021-08-17 14:15:44 -04:00
parent 4f7627bf25
commit 7ae25a5ea3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ca.tweetzy</groupId>
<artifactId>auctionhouse</artifactId>
<version>2.26.0</version>
<version>2.26.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

2
src/main/java/ca/tweetzy/auctionhouse/database/migrations/_7_TransactionBigIntMigration.java
View File

@ -17,7 +17,7 @@ import java.sql.Statement;
public class _7_TransactionBigIntMigration extends DataMigration {
public _7_TransactionBigIntMigration() {
super(6);
super(7);
}
@Override

16
src/main/java/ca/tweetzy/auctionhouse/guis/GUISellItem.java
View File

@ -12,7 +12,6 @@ import ca.tweetzy.core.input.ChatPrompt;
import ca.tweetzy.core.utils.NumberUtils;
import ca.tweetzy.core.utils.PlayerUtils;
import ca.tweetzy.core.utils.TextUtils;
import org.bukkit.Bukkit;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
@ -75,16 +74,16 @@ public class GUISellItem extends Gui {
setOnClose(close -> {
if (!AuctionHouse.getInstance().getAuctionPlayerManager().getUsingSellGUI().contains(close.player.getUniqueId())) {
ItemStack toGiveBack = AuctionHouse.getInstance().getAuctionPlayerManager().getSellHolding().get(close.player.getUniqueId());
if (toGiveBack != null && toGiveBack.getType() != XMaterial.AIR.parseMaterial()) {
PlayerUtils.giveItem(close.player, toGiveBack);
} else {
if (this.itemToBeListed == null || this.itemToBeListed.getType() == XMaterial.AIR.parseMaterial()) {
PlayerUtils.giveItem(close.player, toGiveBack); // this could give them air
if (toGiveBack.getType() == XMaterial.AIR.parseMaterial()) {
if (getItem(1, 4) != null && getItem(1, 4).getType() != XMaterial.AIR.parseMaterial()) {
PlayerUtils.giveItem(close.player, getItem(1, 4));
} else {
PlayerUtils.giveItem(close.player, this.itemToBeListed);
}
}
AuctionHouse.getInstance().getAuctionPlayerManager().removeItemFromSellHolding(close.player.getUniqueId());
}
});
@ -235,7 +234,8 @@ public class GUISellItem extends Gui {
}
private boolean validateChatNumber(String input, double requirement, boolean checkMax) {
if (checkMax) return input != null && input.length() != 0 && NumberUtils.isDouble(input) && Double.parseDouble(input) <= requirement;
if (checkMax)
return input != null && input.length() != 0 && NumberUtils.isDouble(input) && Double.parseDouble(input) <= requirement;
return input != null && input.length() != 0 && NumberUtils.isDouble(input) && Double.parseDouble(input) >= requirement;
}