From 7b67b3b8580b174ef5ac21044fd97665b93ef8aa Mon Sep 17 00:00:00 2001 From: md678685 Date: Thu, 6 Dec 2018 14:05:50 +0000 Subject: [PATCH] Don't send empty line join/quit messages GitHub meta: fixes #991 fixes #2289 --- .../earth2me/essentials/EssentialsPlayerListener.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 56e506276..a79478bcc 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -151,7 +151,12 @@ public class EssentialsPlayerListener implements Listener { event.setQuitMessage(null); } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) { final Player player = event.getPlayer(); - event.setQuitMessage(ess.getSettings().getCustomQuitMessage().replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()).replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size()))); + final String msg = ess.getSettings().getCustomQuitMessage() + .replace("{PLAYER}", player.getDisplayName()) + .replace("{USERNAME}", player.getName()) + .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size())); + + event.setQuitMessage(msg.isEmpty() ? null : msg); } user.startTransaction(); @@ -259,7 +264,9 @@ public class EssentialsPlayerListener implements Listener { .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName()) .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers())) .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size())); - ess.getServer().broadcastMessage(msg); + if (!msg.isEmpty()) { + ess.getServer().broadcastMessage(msg); + } } else if (ess.getSettings().allowSilentJoinQuit()) { ess.getServer().broadcastMessage(message); }