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

adjust order for dealing with confirm listing death return

Browse Source 
Took 13 minutes
This commit is contained in:
Kiran Hart 2023-03-29 00:55:55 -04:00
parent b40f1068d3
commit f4f1c942b0
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ca/tweetzy/auctionhouse/guis/confirmation/GUIListingConfirm.java
View File

@ -26,6 +26,7 @@ import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui;
import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.utils.PlayerUtils; import ca.tweetzy.core.utils.PlayerUtils;
import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.TextUtils;
import ca.tweetzy.flight.comp.enums.CompMaterial;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
@ -59,7 +60,6 @@ public final class GUIListingConfirm extends AbstractPlaceholderGui {
}); });
setOnClose(close -> { setOnClose(close -> {
close.player.removeMetadata("AuctionHouseConfirmListing", AuctionHouse.getInstance());
final AuctionPlayer auctionPlayer = AuctionHouse.getInstance().getAuctionPlayerManager().getPlayer(close.player.getUniqueId()); final AuctionPlayer auctionPlayer = AuctionHouse.getInstance().getAuctionPlayerManager().getPlayer(close.player.getUniqueId());
if (auctionPlayer.getItemBeingListed() != null) { if (auctionPlayer.getItemBeingListed() != null) {
@ -67,6 +67,7 @@ public final class GUIListingConfirm extends AbstractPlaceholderGui {
auctionPlayer.setItemBeingListed(null); auctionPlayer.setItemBeingListed(null);
} }
close.player.removeMetadata("AuctionHouseConfirmListing", AuctionHouse.getInstance());
AuctionHouse.getInstance().getAuctionPlayerManager().processSell(close.player); AuctionHouse.getInstance().getAuctionPlayerManager().processSell(close.player);
}); });
@ -85,8 +86,13 @@ public final class GUIListingConfirm extends AbstractPlaceholderGui {
resulted.add(e.player.getUniqueId()); resulted.add(e.player.getUniqueId());
setAllowClose(true); setAllowClose(true);
final AuctionPlayer auctionPlayer = AuctionHouse.getInstance().getAuctionPlayerManager().getPlayer(e.player.getUniqueId());
auctionPlayer.setItemBeingListed(CompMaterial.AIR.parseItem());
this.result.accept(false); this.result.accept(false);
}); });
setActionForRange(0, 3, ClickType.LEFT, e -> { setActionForRange(0, 3, ClickType.LEFT, e -> {
if (resulted.contains(e.player.getUniqueId())) return; if (resulted.contains(e.player.getUniqueId())) return;
resulted.add(e.player.getUniqueId()); resulted.add(e.player.getUniqueId());

7
src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java
View File

@ -71,8 +71,11 @@ public class PlayerListeners implements Listener {
Bukkit.getServer().getScheduler().cancelTask(auctionPlayer.getAssignedTaskId()); Bukkit.getServer().getScheduler().cancelTask(auctionPlayer.getAssignedTaskId());
if (auctionPlayer.getItemBeingListed() != null && player.getLocation().getWorld() != null) { if (auctionPlayer.getItemBeingListed() != null && player.getLocation().getWorld() != null) {
if (!AuctionHouse.getInstance().getAuctionPlayerManager().isInSellProcess(player)) if (!AuctionHouse.getInstance().getAuctionPlayerManager().isInSellProcess(player)) {
player.getLocation().getWorld().dropItemNaturally(player.getLocation(), auctionPlayer.getItemBeingListed());
if (!player.hasMetadata("AuctionHouseConfirmListing"))
player.getLocation().getWorld().dropItemNaturally(player.getLocation(), auctionPlayer.getItemBeingListed());
}
auctionPlayer.setItemBeingListed(CompMaterial.AIR.parseItem()); auctionPlayer.setItemBeingListed(CompMaterial.AIR.parseItem());
} }
} }