diff --git a/gradle.properties b/gradle.properties index 27acec9..9b63550 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.0.20 +project_version=3.0.21 config_version=36 project_group=net.momirealms diff --git a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/ChatControlRedProvider.java b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/ChatControlRedProvider.java index b6f0505..d359324 100644 --- a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/ChatControlRedProvider.java +++ b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/ChatControlRedProvider.java @@ -29,6 +29,7 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.mineacademy.chatcontrol.PlayerCache; import org.mineacademy.chatcontrol.api.ChatChannelEvent; +import org.mineacademy.chatcontrol.api.ChatControlAPI; import org.mineacademy.chatcontrol.model.Channel; import java.util.Objects; @@ -46,6 +47,9 @@ public class ChatControlRedProvider extends AbstractChatMessageProvider implemen if (!(sender instanceof Player player)) { return; } + if (ChatControlAPI.isChatMuted()) { + return; + } if (!player.isOnline()) return; CNPlayer cnPlayer = plugin.getPlayer(player.getUniqueId()); if (cnPlayer == null) return; diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java index 84368f4..680c22b 100644 --- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java +++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java @@ -178,17 +178,6 @@ public class BukkitCustomNameplates extends CustomNameplates implements Listener this.playerListeners.add((PlayerListener) unlimitedTagManager); this.chatManager.registerListener((ChatListener) bubbleManager); - Bukkit.getPluginManager().registerEvents(this, getBootstrap()); - - this.commandManager.registerDefaultFeatures(); - this.reload(); - - this.loaded = true; - - if (ConfigManager.metrics()) new Metrics(getBootstrap(), 16649); - if (ConfigManager.generateOnStart()) { - this.resourcePackManager.generate(); - } if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { new NameplatesExpansion(this).register(); new NameplatesExtraExpansion(this).register(); @@ -210,6 +199,16 @@ public class BukkitCustomNameplates extends CustomNameplates implements Listener Bukkit.getPluginManager().registerEvents(listener, this.getBootstrap()); } + this.reload(); + this.loaded = true; + Bukkit.getPluginManager().registerEvents(this, getBootstrap()); + this.commandManager.registerDefaultFeatures(); + + if (ConfigManager.metrics()) new Metrics(getBootstrap(), 16649); + if (ConfigManager.generateOnStart()) { + this.resourcePackManager.generate(); + } + if (VersionHelper.isFolia()) { this.foliaTrackerTask = getScheduler().asyncRepeating(() -> { for (CNPlayer player : getOnlinePlayers()) {