Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-26 00:31:50 +01:00
Code Issues Projects Releases Wiki Activity

#443 Use correct message to ask to add email after login

Browse Source
This commit is contained in:
ljacqu 2016-02-27 12:18:04 +01:00
parent 1b818bd833
commit e79f325411
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -50,6 +50,7 @@ import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.SettingsMigrationService; import fr.xephi.authme.settings.SettingsMigrationService;
import fr.xephi.authme.settings.Spawn; import fr.xephi.authme.settings.Spawn;
import fr.xephi.authme.settings.properties.DatabaseSettings; import fr.xephi.authme.settings.properties.DatabaseSettings;
import fr.xephi.authme.settings.properties.EmailSettings;
import fr.xephi.authme.settings.properties.HooksSettings; import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.settings.properties.RestrictionSettings; import fr.xephi.authme.settings.properties.RestrictionSettings;
@ -786,7 +787,7 @@ public class AuthMe extends JavaPlugin {
public void run() { public void run() {
for (PlayerAuth auth : database.getLoggedPlayers()) { for (PlayerAuth auth : database.getLoggedPlayers()) {
String email = auth.getEmail(); String email = auth.getEmail();
if (email == null || email.isEmpty() || email.equalsIgnoreCase("your@email.com")) { if (StringUtils.isEmpty(email) || email.equalsIgnoreCase("your@email.com")) {
Player player = Utils.getPlayer(auth.getRealName()); Player player = Utils.getPlayer(auth.getRealName());
if (player != null) { if (player != null) {
messages.send(player, MessageKey.ADD_EMAIL_MESSAGE); messages.send(player, MessageKey.ADD_EMAIL_MESSAGE);
@ -794,7 +795,7 @@ public class AuthMe extends JavaPlugin {
} }
} }
} }
}, 1, 1200 * Settings.delayRecall); }, 1, 1200 * newSettings.getProperty(EmailSettings.DELAY_RECALL));
} }
public String replaceAllInfo(String message, Player player) { public String replaceAllInfo(String message, Player player) {

6
src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
View File

@ -175,7 +175,7 @@ public class AsynchronousLogin {
displayOtherAccounts(auth); displayOtherAccounts(auth);
if (Settings.recallEmail && (StringUtils.isEmpty(email) || "your@email.com".equalsIgnoreCase(email))) { if (Settings.recallEmail && (StringUtils.isEmpty(email) || "your@email.com".equalsIgnoreCase(email))) {
m.send(player, MessageKey.EMAIL_ADDED_SUCCESS); m.send(player, MessageKey.ADD_EMAIL_MESSAGE);
} }
if (!Settings.noConsoleSpam) { if (!Settings.noConsoleSpam) {
@ -232,8 +232,8 @@ public class AsynchronousLogin {
String message = "[AuthMe] " + StringUtils.join(", ", auths) + "."; String message = "[AuthMe] " + StringUtils.join(", ", auths) + ".";
for (Player player : Utils.getOnlinePlayers()) { for (Player player : Utils.getOnlinePlayers()) {
if (plugin.getPermissionsManager().hasPermission(player, AdminPermission.SEE_OTHER_ACCOUNTS) if (plugin.getPermissionsManager().hasPermission(player, AdminPermission.SEE_OTHER_ACCOUNTS)
|| (player.getName().equals(this.player.getName()) || (player.getName().equals(this.player.getName())
&& plugin.getPermissionsManager().hasPermission(player, PlayerPermission.SEE_OWN_ACCOUNTS))) { && plugin.getPermissionsManager().hasPermission(player, PlayerPermission.SEE_OWN_ACCOUNTS))) {
player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts"); player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts");
player.sendMessage(message); player.sendMessage(message);
} }