If you have /ignore d someone, you shouldn't be able to see their opchat or adminchat messages.

This commit is contained in:
UnknownShadow200 2016-08-30 14:21:01 +10:00
parent 2090a51db1
commit f849db9cae

View File

@ -60,24 +60,26 @@ namespace MCGalaxy {
} }
public static void MessageOps(Player p, string message) { public static void MessageOps(Player p, string message) {
string displayName = p == null ? "(console)" : p.ColoredName; MessageStaff(p, message, Server.opchatperm, "Ops");
string name = p == null ? "(console)" : p.name;
Chat.MessageOps("To Ops &f-" + displayName + "&f- " + message);
if (p != null && p.Rank < Server.opchatperm )
p.SendMessage("To Ops &f-" + displayName + "&f- " + message);
Server.s.Log("(OPs): " + name + ": " + message);
Server.IRC.Say(displayName + "%S: " + message, true);
} }
public static void MessageAdmins(Player p, string message) { public static void MessageAdmins(Player p, string message) {
MessageStaff(p, message, Server.adminchatperm, "Admins");
}
public static void MessageStaff(Player p, string message,
LevelPermission perm, string group) {
string displayName = p == null ? "(console)" : p.ColoredName; string displayName = p == null ? "(console)" : p.ColoredName;
string name = p == null ? "(console)" : p.name; string name = p == null ? "(console)" : p.name;
Chat.MessageAdmins("To Admins &f-" + displayName + "&f- " + message); string format = "To " + group + " &f-{0}&f- {1}";
if (p != null && p.Rank < Server.adminchatperm)
p.SendMessage("To Admins &f-" + displayName + "&f- " + message);
Server.s.Log("(Admins): " + name + ": " + message); Chat.MessageWhere(format,
pl => pl.Rank >= perm && !pl.listignored.Contains(name),
displayName, message);
if (p != null && p.Rank < Server.adminchatperm)
Player.Message(p, format, displayName, message);
Server.s.Log("(" + group + "): " + name + ": " + message);
Server.IRC.Say(displayName + "%S: " + message, true); Server.IRC.Say(displayName + "%S: " + message, true);
} }