From b5b87853f40ea1b3312a6725dfc8939da37723c6 Mon Sep 17 00:00:00 2001 From: Esophose Date: Sat, 11 Apr 2020 14:13:43 -0600 Subject: [PATCH] Fixed messages-enabled not working --- build.gradle | 2 +- changelog.txt | 4 ++++ .../playerparticles/manager/LocaleManager.java | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7b13b24..4c87bcf 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 compileJava.options.encoding = 'UTF-8' group = 'dev.esophose' -version = '7.7' +version = '7.8' java { withJavadocJar() diff --git a/changelog.txt b/changelog.txt index d84d07b..8c320d7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +=== v7.8 === +* Fixed the messages-enabled setting not working at all +=== v7.7 === +* Fixed an error with the style 'blockplace' === v7.6 === + Added style 'teleport' (Thanks HexedHero) * Fixed being able to take items out of GUI when opened from a separate GUI plugin diff --git a/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java b/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java index 705bd62..5ea0353 100644 --- a/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java +++ b/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java @@ -124,6 +124,9 @@ public class LocaleManager extends Manager { * @param stringPlaceholders The placeholders to apply */ public void sendMessage(CommandSender sender, String messageKey, StringPlaceholders stringPlaceholders) { + if (!Setting.MESSAGES_ENABLED.getBoolean()) + return; + sender.sendMessage(this.getLocaleMessage("prefix") + this.getLocaleMessage(messageKey, stringPlaceholders)); } @@ -135,6 +138,9 @@ public class LocaleManager extends Manager { * @param stringPlaceholders The placeholders to apply */ public void sendMessage(PPlayer pplayer, String messageKey, StringPlaceholders stringPlaceholders) { + if (!Setting.MESSAGES_ENABLED.getBoolean()) + return; + pplayer.getUnderlyingExecutor().sendMessage(this.parsePlaceholders(pplayer.getPlayer(), this.getLocaleMessage("prefix") + this.getLocaleMessage(messageKey, stringPlaceholders))); } @@ -166,6 +172,9 @@ public class LocaleManager extends Manager { * @param stringPlaceholders The placeholders to apply */ public void sendSimpleMessage(CommandSender sender, String messageKey, StringPlaceholders stringPlaceholders) { + if (!Setting.MESSAGES_ENABLED.getBoolean()) + return; + sender.sendMessage(this.getLocaleMessage(messageKey, stringPlaceholders)); } @@ -177,6 +186,9 @@ public class LocaleManager extends Manager { * @param stringPlaceholders The placeholders to apply */ public void sendSimpleMessage(PPlayer pplayer, String messageKey, StringPlaceholders stringPlaceholders) { + if (!Setting.MESSAGES_ENABLED.getBoolean()) + return; + pplayer.getUnderlyingExecutor().sendMessage(this.parsePlaceholders(pplayer.getPlayer(), this.getLocaleMessage(messageKey, stringPlaceholders))); } @@ -207,6 +219,9 @@ public class LocaleManager extends Manager { * @param message The message to send */ public void sendCustomMessage(CommandSender sender, String message) { + if (!Setting.MESSAGES_ENABLED.getBoolean()) + return; + sender.sendMessage(message); }