Don't show empty messages in config.yml

If a message field is left empty in config.yml, simply don't display the
message to the player. This works for most messages, but wont for a
certain few.
This commit is contained in:
Esophose 2018-04-05 17:54:53 -06:00
parent 22957cf14e
commit b075fbc1ae

View file

@ -123,11 +123,11 @@ public class MessageManager {
*/
protected void setMessage(FileConfiguration config) {
String messageFromConfig = config.getString(configLocation);
if (messageFromConfig == null || messageFromConfig.length() == 0) {
if (messageFromConfig == null) {
messageFromConfig = "&cMissing message in config.yml. Contact a server administrator.";
PlayerParticles.getPlugin().getLogger().warning("Missing message in config.yml: " + this.configLocation);
}
this.message = ChatColor.translateAlternateColorCodes('&', messageFromConfig);
this.message = parseColors(messageFromConfig);
}
/**
@ -189,6 +189,8 @@ public class MessageManager {
if (!messagesEnabled) return;
String message = messageType.getMessage();
if (message.length() == 0) return;
if (prefixEnabled) {
message = messagePrefix + " " + message;
}
@ -209,12 +211,12 @@ public class MessageManager {
if (!messagesEnabled) return;
String message = messageType.getMessageReplaced(typeReplacement);
if (message.trim().length() == 0) return;
if (prefixEnabled) {
message = messagePrefix + " " + message;
}
if (message.trim().equals("")) return;
player.sendMessage(message);
}
@ -228,12 +230,12 @@ public class MessageManager {
public static void sendCustomMessage(Player player, String message) {
if (!messagesEnabled) return;
if (message.trim().length() == 0) return;
if (prefixEnabled) {
message = messagePrefix + " " + message;
}
if (message.trim().equals("")) return;
player.sendMessage(message);
}