diff --git a/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/conf/PluginMessages.java b/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/conf/PluginMessages.java index cdb5ee2..bca87b3 100644 --- a/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/conf/PluginMessages.java +++ b/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/conf/PluginMessages.java @@ -98,6 +98,11 @@ public static class FEEDBACK extends ConfigurationRoot { "&fYour application for &6%(name) &fserver whitelist &8#&e%(request_id)&f has been rejected, please check the application content and try again." ).params("request_id", "name").build(); + public static final ConfiguredMessageList EXPIRED = list() + .defaults( + "&fYour application for &6%(name) &fserver whitelist &8#&e%(request_id)&f has expired because no enough users to vote. please try again and call on more users to vote for you." + ).params("request_id", "name").build(); + } public static class TOGGLE extends ConfigurationRoot { diff --git a/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/listener/FeedbackListener.java b/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/listener/FeedbackListener.java index c53b4b3..a63a6e6 100644 --- a/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/listener/FeedbackListener.java +++ b/lobby/plugin/src/main/java/com/artformgames/plugin/votepass/lobby/listener/FeedbackListener.java @@ -49,9 +49,7 @@ private boolean handleRequest(Player player, RequestInformation request) { } default -> { if (request.isTimeout(CommonConfig.TIME.AUTO_CLOSE.getNotNull())) { - request.setResult(RequestResult.REJECTED); - request.setCloseTime(LocalDateTime.now()); - handleDeniedRequest(player, configuration, request); + handleExpiredRequest(player, configuration, request); return true; } else { return false; @@ -71,6 +69,19 @@ private void handleDeniedRequest(Player player, ServerSettings configuration, Re VotePassLobbyAPI.getRequestManager().update(request); } + private void handleExpiredRequest(Player player, ServerSettings configuration, RequestInformation request) { + Main.debugging("Handling expired #" + request.getID()); + if (configuration != null) { + PluginMessages.FEEDBACK.EXPIRED.send(player, request.getID(), configuration.name()); + PluginMessages.FEEDBACK.SOUND.playTo(player); + } + + request.setResult(RequestResult.REJECTED); + request.setCloseTime(LocalDateTime.now()); + request.setFeedback(true); + VotePassLobbyAPI.getRequestManager().update(request); + } + private void handleApprovedRequest(Player player, ServerSettings configuration, RequestInformation request) { Main.debugging("Handling approved #" + request.getID()); if (configuration != null) {