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

2.36.1

Browse Source
This commit is contained in:
Kiran Hart 2021-09-27 15:05:23 -04:00
parent 6ab12cae1c
commit bcb6d6e533
3 changed files with 10 additions and 11 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.36.0</version>
<version>2.36.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

15
src/main/java/ca/tweetzy/auctionhouse/commands/CommandSell.java
View File

@ -14,15 +14,12 @@ import ca.tweetzy.core.compatibility.XMaterial;
import ca.tweetzy.core.utils.NumberUtils;
import ca.tweetzy.core.utils.PlayerUtils;
import ca.tweetzy.core.utils.nms.NBTEditor;
import com.sun.prism.shader.Texture_ImagePattern_Loader;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -212,12 +209,14 @@ public final class CommandSell extends AbstractCommand {
if (!Settings.ALLOW_ITEM_BUNDLES.getBoolean() && isBundle) {
return ReturnType.FAILURE;
} else {
if (NBTEditor.contains(itemToSell, "AuctionBundleItem")) {
AuctionHouse.getInstance().getLocale().getMessage("general.cannotsellbundleditem").sendPrefixedMessage(player);
return ReturnType.FAILURE;
}
if (isBundle) {
if (NBTEditor.contains(itemToSell, "AuctionBundleItem")) {
AuctionHouse.getInstance().getLocale().getMessage("general.cannotsellbundleditem").sendPrefixedMessage(player);
return ReturnType.FAILURE;
}
itemToSell = AuctionAPI.getInstance().createBundledItem(itemToSell, AuctionAPI.getInstance().getSimilarItemsFromInventory(player, itemToSell).toArray(new ItemStack[0]));
itemToSell = AuctionAPI.getInstance().createBundledItem(itemToSell, AuctionAPI.getInstance().getSimilarItemsFromInventory(player, itemToSell).toArray(new ItemStack[0]));
}
}
final boolean buyNowAllow = Settings.ALLOW_USAGE_OF_BUY_NOW_SYSTEM.getBoolean();

4
src/main/java/ca/tweetzy/auctionhouse/guis/transaction/GUITransactionType.java
View File

@ -17,7 +17,7 @@ public final class GUITransactionType extends Gui {
public GUITransactionType() {
setTitle(TextUtils.formatText(Settings.GUI_TRANSACTIONS_TYPE_TITLE.getString()));
setRows(5);
setRows(4);
setAcceptsItems(false);
setUseLockedCells(true);
setDefaultItem(Settings.GUI_TRANSACTIONS_TYPE_BG_ITEM.getMaterial().parseItem());
@ -34,6 +34,6 @@ public final class GUITransactionType extends Gui {
e.manager.showGUI(e.player, new GUITransactionList(e.player, false));
});
setButton(4, 0, ConfigurationItemHelper.createConfigurationItem(Settings.GUI_BACK_BTN_ITEM.getString(), Settings.GUI_BACK_BTN_NAME.getString(), Settings.GUI_BACK_BTN_LORE.getStringList(), null), e -> e.manager.showGUI(e.player, new GUIAuctionHouse(AuctionHouse.getInstance().getAuctionPlayerManager().getPlayer(e.player.getUniqueId()))));
setButton(3, 0, ConfigurationItemHelper.createConfigurationItem(Settings.GUI_BACK_BTN_ITEM.getString(), Settings.GUI_BACK_BTN_NAME.getString(), Settings.GUI_BACK_BTN_LORE.getStringList(), null), e -> e.manager.showGUI(e.player, new GUIAuctionHouse(AuctionHouse.getInstance().getAuctionPlayerManager().getPlayer(e.player.getUniqueId()))));
}
}