diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java index 29c862613..ec6d2059f 100644 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java @@ -238,7 +238,7 @@ public class DiscordSettings implements IConf { filled = format; } return generateMessageFormat(filled, ":arrow_right: {displayname} has joined!", false, - "username", "displayname", "joinmessage"); + "username", "displayname", "joinmessage", "online", "unique"); } public MessageFormat getQuitFormat(Player player) { @@ -250,7 +250,7 @@ public class DiscordSettings implements IConf { filled = format; } return generateMessageFormat(filled, ":arrow_left: {displayname} has left!", false, - "username", "displayname", "quitmessage"); + "username", "displayname", "quitmessage", "online", "unique"); } public MessageFormat getDeathFormat(Player player) { diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java index 74f7bf2be..68ca0eeb2 100644 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java @@ -134,7 +134,9 @@ public class BukkitListener implements Listener { MessageUtil.formatMessage(join ? jda.getSettings().getJoinFormat(player) : jda.getSettings().getQuitFormat(player), MessageUtil.sanitizeDiscordMarkdown(player.getName()), MessageUtil.sanitizeDiscordMarkdown(player.getDisplayName()), - MessageUtil.sanitizeDiscordMarkdown(message)), + MessageUtil.sanitizeDiscordMarkdown(message), + jda.getPlugin().getEss().getOnlinePlayers().size() - (join ? 0 : 1), + jda.getPlugin().getEss().getUserMap().getUniqueUsers()), player); } diff --git a/EssentialsDiscord/src/main/resources/config.yml b/EssentialsDiscord/src/main/resources/config.yml index ca35f9d46..d8bb0b0a4 100644 --- a/EssentialsDiscord/src/main/resources/config.yml +++ b/EssentialsDiscord/src/main/resources/config.yml @@ -293,6 +293,8 @@ messages: # - {username}: The name of the user joining # - {displayname}: The display name of the user joining # - {joinmessage}: The full default join message used in game + # - {online}: The amount of players online + # - {unique}: The amount of unique players to ever join the server # ... PlaceholderAPI placeholders are also supported here too! join: ":arrow_right: {displayname} has joined!" # This is the message sent to Discord when a player leaves the minecraft server. @@ -300,6 +302,8 @@ messages: # - {username}: The name of the user leaving # - {displayname}: The display name of the user leaving # - {quitmessage}: The full default leave message used in game + # - {online}: The amount of players online + # - {unique}: The amount of unique players to ever join the server # ... PlaceholderAPI placeholders are also supported here too! quit: ":arrow_left: {displayname} has left!" # This is the message sent to Discord when a player dies.