From 22e40dc7e1482f7e92327898540e7dffb7ae6775 Mon Sep 17 00:00:00 2001
From: Xinecraft <kinnngg786@gmail.com>
Date: Fri, 22 Nov 2024 19:17:24 +0530
Subject: [PATCH] 6.3.0 release

---
 .../xinecraft/minetrax/bukkit/MinetraxBukkit.java |  2 +-
 bukkit/src/main/resources/config.yml              | 15 +++++++++------
 .../common/banwarden/hooks/LitebansHook.java      |  3 +++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java b/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java
index 756633a..7c129c5 100644
--- a/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java
+++ b/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java
@@ -243,7 +243,7 @@ public void onEnable() {
 
         // Setup Schedulers
         if (isRemindPlayerToLinkEnabled) {
-            getServer().getScheduler().scheduleSyncRepeatingTask(this, new AccountLinkReminderTask(), 10 * 20, remindPlayerToLinkInterval * 20L);
+            getServer().getScheduler().scheduleSyncRepeatingTask(this, new AccountLinkReminderTask(), remindPlayerToLinkInterval * 20L, remindPlayerToLinkInterval * 20L);
         }
         if (isServerIntelEnabled) {
             getServer().getScheduler().runTaskTimerAsynchronously(this, new ServerIntelReportTask(), 60 * 20L, 60 * 20L);   // every minute
diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml
index 8278023..1192382 100644
--- a/bukkit/src/main/resources/config.yml
+++ b/bukkit/src/main/resources/config.yml
@@ -43,9 +43,11 @@ remind-player-to-link: true
 remind-player-interval: 300
 # The message send to player to remind them to link their account
 remind-player-link-message:
-  - "&eHey there! It seems you haven't linked your player in web yet. Please visit the link below to start the process."
-  - ""
-  - "&e**[{LINK_URL}]({LINK_URL} Click to visit)**"
+  - "&c&lWARNING! Your player isn't linked yet."
+  - "&cPlease follow these steps to link:"
+  - "&61. &fVisit &b[{WEB_URL}]({WEB_URL} Click to visit)&f and log in or register."
+  - "&62. &fNavigate to &eProfile > Linked Players&f, or directly visit &b[{LINK_URL}]({LINK_URL} Click to visit)&f."
+  - "&63. &fCopy the generated code and enter it in the chat, eg: &e/link 123456"
 # Keep sending reminder to player even if they are already linked.
 remind-player-when-already-linked: false
 # The message send to player to remind them that their account is already linked
@@ -54,9 +56,10 @@ remind-player-already-linked-message:
     - "&aVisit [{WEB_URL}]({WEB_URL} Click to visit) to view your stats and more."
 # Message when player send /account-link without otp parameter
 player-link-init-message:
-  - "&bPlease visit below link and follow the steps there to continue linking your account."
-  - ""
-  - "&b**[{LINK_URL}]({LINK_URL} Click to visit)**"
+  - "&6&lPlease follow these steps to link:"
+  - "&61. &fVisit &b[{WEB_URL}]({WEB_URL} Click to visit)&f and log in or register."
+  - "&62. &fNavigate to &eProfile > Linked Players&f, or directly visit &b[{LINK_URL}]({LINK_URL} Click to visit)&f."
+  - "&63. &fCopy the generated code and enter it in the chat, eg: &e/link 123456"
 # Message when player send /account-link while player is already linked
 player-link-init-already-linked-message:
   - "&aYay! Your player is already linked."
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java
index 74b1c17..79647a6 100644
--- a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java
+++ b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java
@@ -41,6 +41,9 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {
 
     @Override
     public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
+        if (reason.isBlank()) {
+            reason = "-";
+        }
         switch (type) {
             case BAN -> common.getCommander().dispatchCommand("litebans:unban " + victim + " " + reason);
             case MUTE -> common.getCommander().dispatchCommand("litebans:unmute " + victim + " " + reason);