Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add online/unique placeholders to join/leave formats for discord #4427

Merged
merged 4 commits into from
Aug 9, 2021
Merged

Add online/unique placeholders to join/leave formats for discord #4427

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec6f85d
Add offline and unique placeholders to join/leave formats for EssXDis…
JRoy Aug 2, 2021
9f96ed1
Merge branch '2.x' into feature/player-count-discord
JRoy Aug 8, 2021
ba4de14
Merge branch '2.x' into feature/player-count-discord
JRoy Aug 9, 2021
5a49159
Update EssentialsDiscord/src/main/java/net/essentialsx/discord/Discor…
JRoy Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public MessageFormat getJoinFormat(Player player) {
filled = format;
}
return generateMessageFormat(filled, ":arrow_right: {displayname} has joined!", false,
"username", "displayname", "joinmessage");
"username", "displayname", "joinmessage", "online", "unique");
}

public MessageFormat getQuitFormat(Player player) {
Expand All @@ -246,7 +246,7 @@ public MessageFormat getQuitFormat(Player player) {
filled = format;
}
return generateMessageFormat(filled, ":arrow_left: {displayname} has left!", false,
"username", "displayname", "quitmessage");
"username", "displayname", "quitmessage", "online");
}

public MessageFormat getDeathFormat(Player player) {
Expand Down
5 changes: 4 additions & 1 deletion EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@ public void sendJoinQuitMessage(final Player player, final String message, boole
MessageUtil.sanitizeDiscordMarkdown(player.getName()),
MessageUtil.sanitizeDiscordMarkdown(player.getDisplayName()),
MessageUtil.sanitizeDiscordMarkdown(message),
jda.getPlugin().getEss().getOnlinePlayers().size() - (join ? 0 : 1),
jda.getPlugin().getEss().getUserMap().getUniqueUsers()),
false,
jda.getSettings().isShowAvatar() ? jda.getSettings().getAvatarURL().replace("{uuid}", player.getUniqueId().toString()) : null,
jda.getSettings().isShowName() ? player.getName() : (jda.getSettings().isShowDisplayName() ? player.getDisplayName() : null),
player.getUniqueId()));
player.getUniqueId());
}

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
Expand All @@ -154,6 +156,7 @@ public void onDeath(PlayerDeathEvent event) {
if (!event.getEntity().getWorld().isGameRule("showDeathMessages")) {
showDeathMessages = null;
} else {
//noinspection deprecation
showDeathMessages = event.getEntity().getWorld().getGameRuleValue("showDeathMessages").equals("true");
}
}
Expand Down
4 changes: 4 additions & 0 deletions EssentialsDiscord/src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,17 @@ 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.
# The following placeholders can be used here:
# - {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.
Expand Down