Skip to content

Commit 22e40dc

Browse files
committed
6.3.0 release
1 parent 04711f7 commit 22e40dc

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public void onEnable() {
243243

244244
// Setup Schedulers
245245
if (isRemindPlayerToLinkEnabled) {
246-
getServer().getScheduler().scheduleSyncRepeatingTask(this, new AccountLinkReminderTask(), 10 * 20, remindPlayerToLinkInterval * 20L);
246+
getServer().getScheduler().scheduleSyncRepeatingTask(this, new AccountLinkReminderTask(), remindPlayerToLinkInterval * 20L, remindPlayerToLinkInterval * 20L);
247247
}
248248
if (isServerIntelEnabled) {
249249
getServer().getScheduler().runTaskTimerAsynchronously(this, new ServerIntelReportTask(), 60 * 20L, 60 * 20L); // every minute

bukkit/src/main/resources/config.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ remind-player-to-link: true
4343
remind-player-interval: 300
4444
# The message send to player to remind them to link their account
4545
remind-player-link-message:
46-
- "&eHey there! It seems you haven't linked your player in web yet. Please visit the link below to start the process."
47-
- ""
48-
- "&e**[{LINK_URL}]({LINK_URL} Click to visit)**"
46+
- "&c&lWARNING! Your player isn't linked yet."
47+
- "&cPlease follow these steps to link:"
48+
- "&61. &fVisit &b[{WEB_URL}]({WEB_URL} Click to visit)&f and log in or register."
49+
- "&62. &fNavigate to &eProfile > Linked Players&f, or directly visit &b[{LINK_URL}]({LINK_URL} Click to visit)&f."
50+
- "&63. &fCopy the generated code and enter it in the chat, eg: &e/link 123456"
4951
# Keep sending reminder to player even if they are already linked.
5052
remind-player-when-already-linked: false
5153
# The message send to player to remind them that their account is already linked
@@ -54,9 +56,10 @@ remind-player-already-linked-message:
5456
- "&aVisit [{WEB_URL}]({WEB_URL} Click to visit) to view your stats and more."
5557
# Message when player send /account-link without otp parameter
5658
player-link-init-message:
57-
- "&bPlease visit below link and follow the steps there to continue linking your account."
58-
- ""
59-
- "&b**[{LINK_URL}]({LINK_URL} Click to visit)**"
59+
- "&6&lPlease follow these steps to link:"
60+
- "&61. &fVisit &b[{WEB_URL}]({WEB_URL} Click to visit)&f and log in or register."
61+
- "&62. &fNavigate to &eProfile > Linked Players&f, or directly visit &b[{LINK_URL}]({LINK_URL} Click to visit)&f."
62+
- "&63. &fCopy the generated code and enter it in the chat, eg: &e/link 123456"
6063
# Message when player send /account-link while player is already linked
6164
player-link-init-already-linked-message:
6265
- "&aYay! Your player is already linked."

common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {
4141

4242
@Override
4343
public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
44+
if (reason.isBlank()) {
45+
reason = "-";
46+
}
4447
switch (type) {
4548
case BAN -> common.getCommander().dispatchCommand("litebans:unban " + victim + " " + reason);
4649
case MUTE -> common.getCommander().dispatchCommand("litebans:unmute " + victim + " " + reason);

0 commit comments

Comments
 (0)