AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-16 12:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mute & unmute improvements

Browse Source 
- fix muted player messages being sent to discord
- fix mute sending 2 messages
- tell sender target has been unmuted
This commit is contained in:
speedxx 2020-07-17 19:54:46 -04:00
parent 5a41632654
commit cb1c67e568
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
View File

@ -1,7 +1,6 @@
package me.totalfreedom.totalfreedommod;
import com.google.common.base.Strings;
import java.util.Date;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.FPlayer;
@ -138,7 +137,7 @@ public class ChatManager extends FreedomService
event.setFormat(format);
// Send to discord
if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist())
if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted())
{
plugin.dc.messageChatChannel(plugin.dc.deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message));
}

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java
View File

@ -142,8 +142,6 @@ public class Command_mute extends FreedomCommand
FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
msg(player, "You have been muted by " + ChatColor.YELLOW + sender.getName(), ChatColor.RED);
if (smite)
{
Command_smite.smite(sender, player, reason);

19
src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java
View File

@ -42,28 +42,25 @@ public class Command_unmute extends FreedomCommand
}
FPlayer playerdata = plugin.pl.getPlayer(player);
if (plugin.al.isAdmin(player))
{
msg(player.getName() + " is an admin, and can't be muted.");
return true;
}
if (playerdata.isMuted())
{
playerdata.setMuted(false);
msg(player, "You have been unmuted.", ChatColor.RED);
player.sendTitle(ChatColor.RED + "You've been unmuted.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
if (!quiet)
if (quiet)
{
FUtil.adminAction(sender.getName(), "Unmuting " + player.getName(), true);
}
msg("Unmuted " + player.getName() + " quietly");
return true;
}
FUtil.adminAction(sender.getName(), "Unmuting " + player.getName(), true);
msg("Unmuted " + player.getName());
msg(player, "You have been unmuted.", ChatColor.RED);
}
else
{
msg(ChatColor.RED + "That player is not muted.");
}
return true;
}
}