TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-31 19:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed support for empty messages

Browse Source
This commit is contained in:
games647
2016-06-09 14:33:14 +02:00
parent f6aa064835
commit 679060d4e9
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
View File

@@ -46,7 +46,9 @@ public class BukkitCore extends FastLoginCore {
YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile); YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile);
for (String key : messageConfig.getKeys(false)) { for (String key : messageConfig.getKeys(false)) {
String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key)); String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
localeMessages.put(key, message); if (!message.isEmpty()) {
localeMessages.put(key, message);
}
} }
} }

7
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
View File

@@ -86,7 +86,12 @@ public class ForceLoginTask implements Runnable {
String generatedPassword = plugin.generateStringPassword(player); String generatedPassword = plugin.generateStringPassword(player);
boolean success = authPlugin.forceRegister(player, generatedPassword); boolean success = authPlugin.forceRegister(player, generatedPassword);
player.sendMessage(plugin.getCore().getMessage("auto-register").replace("%password", generatedPassword)); String message = plugin.getCore().getMessage("auto-register");
if (message != null) {
message = message.replace("%password", generatedPassword);
}
player.sendMessage(message);
return success; return success;
} }

4
bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
View File

@@ -54,7 +54,9 @@ public class BungeeCore extends FastLoginCore {
Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class).load(messageFile); Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class).load(messageFile);
for (String key : messageConfig.getKeys()) { for (String key : messageConfig.getKeys()) {
String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key)); String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
localeMessages.put(key, message); if (!message.isEmpty()) {
localeMessages.put(key, message);
}
} }
} catch (IOException ex) { } catch (IOException ex) {
getLogger().log(Level.SEVERE, "Failed to load messages", ex); getLogger().log(Level.SEVERE, "Failed to load messages", ex);