TotalFreedomMC/TFGuilds
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TFGuilds.git synced 2024-12-22 07:55:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix moderator chat

Browse source
This commit is contained in:
Nathan Curran 2021-06-28 22:46:46 +10:00
parent 32afc7c1b2
commit 4ec00d977c
No known key found for this signature in database
GPG key ID: B3A964B30C2E56B8
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>me.totalfreedom</groupId> <groupId>me.totalfreedom</groupId>
<artifactId>TFGuilds</artifactId> <artifactId>TFGuilds</artifactId>
<version>2021.06-RC2</version> <version>2021.06-RC3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TFGuilds</name> <name>TFGuilds</name>

6
src/main/java/me/totalfreedom/tfguilds/command/ModChatSubCommand.java
View file

@ -25,6 +25,12 @@ public class ModChatSubCommand extends Common implements SubCommand
return; return;
} }
if (!guild.isModerator(playerSender))
{
sender.sendMessage(PREFIX + "You must be a guild moderator to set player's rank for your guild.");
return;
}
if (args.length == 1) if (args.length == 1)
{ {
sender.sendMessage(USAGE + "/g mchat <message>"); sender.sendMessage(USAGE + "/g mchat <message>");

9
src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
View file

@ -820,7 +820,14 @@ public class Guild
{ {
if (User.getUserFromPlayer(p).displayChat() && isMember(p)) if (User.getUserFromPlayer(p).displayChat() && isMember(p))
{ {
p.sendMessage(GUtil.colorize("&7[&bGuild " + (modChat ? "Mod " : "") + "Chat &7| &b" + name + "&7] " + player.getName() + " &8\u00BB &6") + message); if (modChat && isModerator(p))
{
p.sendMessage(GUtil.colorize("&7[&bGuild Mod Chat &7| &b" + name + "&7] " + player.getName() + " &8\u00BB &6") + message);
}
else
{
p.sendMessage(GUtil.colorize("&7[&bGuild Chat &7| &b" + name + "&7] " + player.getName() + " &8\u00BB &6") + message);
}
} }
if (Common.GUILD_CHAT_SPY.contains(p) && player != p && !isMember(p)) if (Common.GUILD_CHAT_SPY.contains(p) && player != p && !isMember(p))