Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-29 20:17:36 +01:00
Code Issues Projects Releases Wiki Activity

Don't use the customJoinMessage if removeJoinMessage is enabled

Browse Source
This commit is contained in:
Gabriele C 2017-01-06 12:00:05 +01:00
parent 6cf8789fe0
commit 044e3e3845
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/fr/xephi/authme/listener/PlayerListener.java
View File

@ -166,7 +166,9 @@ public class PlayerListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onJoinMessage(PlayerJoinEvent event) { public void onJoinMessage(PlayerJoinEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (player == null) {
if (settings.getProperty(RegistrationSettings.REMOVE_JOIN_MESSAGE)) {
event.setJoinMessage(null);
return; return;
} }
@ -175,10 +177,7 @@ public class PlayerListener implements Listener {
event.setJoinMessage(customJoinMessage.replace("{PLAYERNAME}", player.getName()) event.setJoinMessage(customJoinMessage.replace("{PLAYERNAME}", player.getName())
.replace("{DISPLAYNAME]", player.getDisplayName())); .replace("{DISPLAYNAME]", player.getDisplayName()));
} }
if (settings.getProperty(RegistrationSettings.REMOVE_JOIN_MESSAGE)) {
event.setJoinMessage(null);
return;
}
if (!settings.getProperty(RegistrationSettings.DELAY_JOIN_MESSAGE)) { if (!settings.getProperty(RegistrationSettings.DELAY_JOIN_MESSAGE)) {
return; return;
} }