From 168186321c08c443440035678c91cb201cdc08a4 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sun, 7 Aug 2016 12:04:20 +0200 Subject: [PATCH] Add setting to remove quit messages for unlogged players #833 --- src/main/java/fr/xephi/authme/listener/PlayerListener.java | 4 ++++ .../authme/settings/properties/RegistrationSettings.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index fb736fa2..8906f926 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -248,6 +248,10 @@ public class PlayerListener implements Listener { if (settings.getProperty(RegistrationSettings.REMOVE_LEAVE_MESSAGE)) { event.setQuitMessage(null); + } else if (settings.getProperty(RegistrationSettings.REMOVE_UNLOGGED_LEAVE_MESSAGE)) { + if(listenerService.shouldCancelEvent(event)) { + event.setQuitMessage(null); + } } if (antiBot.wasPlayerKicked(player.getName())) { diff --git a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java index db1cb1ee..4db45842 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java @@ -84,11 +84,15 @@ public class RegistrationSettings implements SettingsClass { public static final Property DELAY_JOIN_MESSAGE = newProperty("settings.delayJoinMessage", false); + @Comment("Should we remove leave messages for unlogged users?") + public static final Property REMOVE_UNLOGGED_LEAVE_MESSAGE = + newProperty("settings.removeUnloggedLeaveMessage", false); + @Comment("Should we remove join messages altogether?") public static final Property REMOVE_JOIN_MESSAGE = newProperty("settings.removeJoinMessage", false); - @Comment("Should we remove leave messages?") + @Comment("Should we remove leave messages altogether?") public static final Property REMOVE_LEAVE_MESSAGE = newProperty("settings.removeLeaveMessage", false);