TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-02-11 11:40:21 +00:00
Code Issues Projects Releases Wiki Activity

Don't show empty messages in config.yml

Browse source 
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
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/com/esophose/playerparticles/manager/MessageManager.java
View file

@ -123,11 +123,11 @@ public class MessageManager {
*/ */
protected void setMessage(FileConfiguration config) { protected void setMessage(FileConfiguration config) {
String messageFromConfig = config.getString(configLocation); String messageFromConfig = config.getString(configLocation);
if (messageFromConfig == null || messageFromConfig.length() == 0) { if (messageFromConfig == null) {
messageFromConfig = "&cMissing message in config.yml. Contact a server administrator."; messageFromConfig = "&cMissing message in config.yml. Contact a server administrator.";
PlayerParticles.getPlugin().getLogger().warning("Missing message in config.yml: " + this.configLocation); 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; if (!messagesEnabled) return;
String message = messageType.getMessage(); String message = messageType.getMessage();
if (message.length() == 0) return;
if (prefixEnabled) { if (prefixEnabled) {
message = messagePrefix + " " + message; message = messagePrefix + " " + message;
} }
@ -209,12 +211,12 @@ public class MessageManager {
if (!messagesEnabled) return; if (!messagesEnabled) return;
String message = messageType.getMessageReplaced(typeReplacement); String message = messageType.getMessageReplaced(typeReplacement);
if (message.trim().length() == 0) return;
if (prefixEnabled) { if (prefixEnabled) {
message = messagePrefix + " " + message; message = messagePrefix + " " + message;
} }
if (message.trim().equals("")) return;
player.sendMessage(message); player.sendMessage(message);
} }
@ -227,13 +229,13 @@ public class MessageManager {
*/ */
public static void sendCustomMessage(Player player, String message) { public static void sendCustomMessage(Player player, String message) {
if (!messagesEnabled) return; if (!messagesEnabled) return;
if (message.trim().length() == 0) return;
if (prefixEnabled) { if (prefixEnabled) {
message = messagePrefix + " " + message; message = messagePrefix + " " + message;
} }
if (message.trim().equals("")) return;
player.sendMessage(message); player.sendMessage(message);
} }