Fixes (/u ncolor), not allowing two of the same town colors, not broadcasting announcements if nobody is online #93

Merged
NorbiPeti merged 10 commits from dev into master 2019-01-03 20:43:22 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit fd72e2de91 - Show all commits

View file

@ -145,7 +145,7 @@ public class ChatProcessing {
DebugCommand.SendDebugMessage(jsonstr);
try {
if (channel.filteranderrormsg != null) {
if (!channel.isGlobal()) {
Objective obj = PluginMain.SB.getObjective(channel.ID);
int score = -1;
for (Player p : Bukkit.getOnlinePlayers()) {

View file

@ -272,7 +272,7 @@ public class PlayerListener implements Listener {
@EventHandler
public void onChannelRegistered(ChatChannelRegisterEvent e) {
if (e.getChannel().filteranderrormsg != null && PluginMain.SB.getObjective(e.getChannel().ID) == null) // Not global chat and doesn't exist yet
if (!e.getChannel().isGlobal() && PluginMain.SB.getObjective(e.getChannel().ID) == null) // Not global chat and doesn't exist yet
PluginMain.SB.registerNewObjective(e.getChannel().ID, "dummy");
}