From 6eb1b6f05a4c520139bc959ea3e6aefc3721619c Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:50:30 -0500 Subject: [PATCH] Fix config --- .../server/0072-Improve-Purpur-AFK-system.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/server/0072-Improve-Purpur-AFK-system.patch b/patches/server/0072-Improve-Purpur-AFK-system.patch index 4b9184b1..39788668 100644 --- a/patches/server/0072-Improve-Purpur-AFK-system.patch +++ b/patches/server/0072-Improve-Purpur-AFK-system.patch @@ -87,7 +87,7 @@ index 42885c7f374f619fe63d9fe22a4b7f88d68008c3..08407b2eaacb581085f6c22820304fd1 this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index e45c11bf2c42e6d57f803349d8ca6936ac98c995..8c670fcb3729c440096f78d469d1ca32a9496c78 100644 +index e45c11bf2c42e6d57f803349d8ca6936ac98c995..44bdaa087496ccf0c3ba291e8f4691eb7ae0b6c6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -176,9 +176,14 @@ public class PurpurConfig { @@ -98,22 +98,24 @@ index e45c11bf2c42e6d57f803349d8ca6936ac98c995..8c670fcb3729c440096f78d469d1ca32 + public static String afkSubTitleAway = "You are now AFK..."; public static boolean afkBroadcastUseDisplayName = false; public static String afkTabListPrefix = "[AFK] "; -- public static String afkTabListSuffix = ""; + public static String afkTabListCustomName = "%player_name% [AFK]"; -+ public static String afkTabListSuffix = "You need to wait %time%s to use /afk."; -+ public static long afkCommandCooldown = 3; -+ public static String afkCooldown = ""; + public static String afkTabListSuffix = ""; ++ public static int afkCommandCooldown = 0; ++ public static String afkCooldown = "You need to wait %time%s to use /afk."; public static String creditsCommandOutput = "%s has been shown the end credits"; public static String demoCommandOutput = "%s has been shown the demo screen"; public static String pingCommandOutput = "%s's ping is %sms"; -@@ -197,6 +202,7 @@ public class PurpurConfig { +@@ -197,7 +202,10 @@ public class PurpurConfig { afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack); afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName); afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix))); + afkTabListCustomName = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-custom-name", afkTabListCustomName))); afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix))); ++ afkCommandCooldown = getInt("settings.messages.afk-command-cooldown", afkCommandCooldown); ++ afkCooldown = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-command-cooldown-msg", afkCooldown))); creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput); demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput); + pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); diff --git a/src/main/java/org/purpurmc/purpur/command/AFKCommand.java b/src/main/java/org/purpurmc/purpur/command/AFKCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..8dca966c25f8e3f5622ef8f5862fdb43eae3813f