From e96e3626666055d3b214504d18d7ac2759a841a8 Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Wed, 17 Mar 2021 22:41:00 -0400 Subject: [PATCH] minor changes to update checker, removed file adjust for expired items in tick task --- .../ca/tweetzy/auctionhouse/AuctionHouse.java | 5 +++-- .../tweetzy/auctionhouse/api/UpdateChecker.java | 17 ++++++++--------- .../auctionhouse/listeners/PlayerListeners.java | 5 +++++ .../auctionhouse/tasks/TickAuctionsTask.java | 6 ------ 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java b/src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java index 40000bb..51f36fa 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java +++ b/src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java @@ -106,7 +106,9 @@ public class AuctionHouse extends TweetyPlugin { TickAuctionsTask.startTask(); // update check - this.status = new UpdateChecker(this, 60325, getConsole()).check().getStatus(); + getServer().getScheduler().runTaskLaterAsynchronously(this, () -> { + this.status = new UpdateChecker(this, 60325, getConsole()).check().getStatus(); + }, 1L); // metrics this.metrics = new Metrics(this, (int) PluginID.AUCTION_HOUSE.getbStatsID()); @@ -116,7 +118,6 @@ public class AuctionHouse extends TweetyPlugin { public void onPluginDisable() { this.auctionItemManager.saveItems(); instance = null; - //token change test } @Override diff --git a/src/main/java/ca/tweetzy/auctionhouse/api/UpdateChecker.java b/src/main/java/ca/tweetzy/auctionhouse/api/UpdateChecker.java index f302798..3c01094 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/api/UpdateChecker.java +++ b/src/main/java/ca/tweetzy/auctionhouse/api/UpdateChecker.java @@ -1,10 +1,9 @@ package ca.tweetzy.auctionhouse.api; import ca.tweetzy.auctionhouse.AuctionHouse; +import ca.tweetzy.core.TweetyPlugin; import ca.tweetzy.core.utils.TextUtils; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; -import org.bukkit.plugin.java.JavaPlugin; import javax.net.ssl.HttpsURLConnection; import java.io.BufferedReader; @@ -28,7 +27,7 @@ public class UpdateChecker { private UpdateStatus status = UpdateStatus.UNKNOWN; final String API_URL = "https://api.spigotmc.org/legacy/update.php?resource=%d"; - final JavaPlugin plugin; + final TweetyPlugin plugin; final int SPIGOT_ID; final CommandSender[] to; private String latestVersion = "0.0.0"; @@ -89,19 +88,19 @@ public class UpdateChecker { for (CommandSender sender : to) { switch (status) { case UP_TO_DATE: - AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&aIs running the latest version!")).sendPrefixedMessage(sender); + plugin.getLocale().newMessage(TextUtils.formatText("&aIs running the latest version!")).sendPrefixedMessage(sender); break; case UPDATE_AVAILABLE: - AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&dA new update is available for Auction House")).sendPrefixedMessage(sender); + plugin.getLocale().newMessage(TextUtils.formatText("&dA new update is available for Auction House")).sendPrefixedMessage(sender); break; case UNRELEASED_VERSION: - AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText(String.format("&dYou're running an unreleased version of Auction House &f(&c%s&f)", AuctionHouse.getInstance().getDescription().getVersion()))).sendPrefixedMessage(sender); + plugin.getLocale().newMessage(TextUtils.formatText(String.format("&dYou're running an unreleased version of Auction House &f(&c%s&f)", plugin.getDescription().getVersion()))).sendPrefixedMessage(sender); break; case UNKNOWN: - AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&cUnknown version is in use")).sendPrefixedMessage(sender); + plugin.getLocale().newMessage(TextUtils.formatText("&cUnknown version is in use")).sendPrefixedMessage(sender); break; case ERROR: - AuctionHouse.getInstance().getLocale().newMessage(TextUtils.formatText("&cAn error has occurred while trying to get the latest version")).sendPrefixedMessage(sender); + plugin.getLocale().newMessage(TextUtils.formatText("&cAn error has occurred while trying to get the latest version")).sendPrefixedMessage(sender); break; } } @@ -109,7 +108,7 @@ public class UpdateChecker { return this; } - public UpdateChecker(JavaPlugin plugin, int spigotID, CommandSender... to) { + public UpdateChecker(TweetyPlugin plugin, int spigotID, CommandSender... to) { this.plugin = plugin; this.SPIGOT_ID = spigotID; this.to = to; diff --git a/src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java b/src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java index 37523fb..98aa169 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java +++ b/src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java @@ -1,7 +1,9 @@ package ca.tweetzy.auctionhouse.listeners; import ca.tweetzy.auctionhouse.AuctionHouse; +import ca.tweetzy.auctionhouse.api.UpdateChecker; import ca.tweetzy.auctionhouse.auction.AuctionPlayer; +import ca.tweetzy.core.utils.TextUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -22,6 +24,9 @@ public class PlayerListeners implements Listener { Player player = e.getPlayer(); Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(AuctionHouse.getInstance(), () -> { AuctionHouse.getInstance().getAuctionPlayerManager().addPlayer(new AuctionPlayer(player)); + if (AuctionHouse.getInstance().getUpdateStatus() == UpdateChecker.UpdateStatus.UNRELEASED_VERSION && player.isOp()) { + AuctionHouse.getInstance().getLocale().getMessage(TextUtils.formatText(String.format("&dYou're running an unreleased version of Auction House &f(&c%s&f)", AuctionHouse.getInstance().getDescription().getVersion()))).sendPrefixedMessage(player); + } }, 20); } diff --git a/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java b/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java index 12c1dbe..f8c4541 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java +++ b/src/main/java/ca/tweetzy/auctionhouse/tasks/TickAuctionsTask.java @@ -56,7 +56,6 @@ public class TickAuctionsTask extends BukkitRunnable { if (item.getOwner().equals(item.getHighestBidder())) { // was not sold item.setExpired(true); - AuctionHouse.getInstance().getAuctionItemManager().adjustItemsInFile(item, true); } else { // the item was sold ?? then do the checks OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(item.getHighestBidder()); @@ -88,13 +87,11 @@ public class TickAuctionsTask extends BukkitRunnable { } AuctionHouse.getInstance().getAuctionItemManager().removeItem(item.getKey()); - AuctionHouse.getInstance().getAuctionItemManager().adjustItemsInFile(item, false); } } else { // they don't have enough money to buy it, so send it back to the original owner item.setExpired(true); - AuctionHouse.getInstance().getAuctionItemManager().adjustItemsInFile(item, true); } } else { // offline, so save their purchase in the collection inventory @@ -108,16 +105,13 @@ public class TickAuctionsTask extends BukkitRunnable { AuctionHouse.getInstance().getEconomy().depositPlayer(Bukkit.getOfflinePlayer(item.getOwner()), item.getCurrentPrice()); item.setOwner(offlinePlayer.getUniqueId()); item.setExpired(true); - AuctionHouse.getInstance().getAuctionItemManager().adjustItemsInFile(item, true); } } else { // they don't have enough money to buy it, so send it back to the original owner item.setExpired(true); - AuctionHouse.getInstance().getAuctionItemManager().adjustItemsInFile(item, true); } } } - }); } catch (Exception e) {