From 26896d2f1bdad386e7706ce751bca755be68cfae Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Mon, 28 Nov 2016 08:43:17 +1100 Subject: [PATCH] fix last commit --- MCGalaxy/Commands/Chat/MessageCmd.cs | 2 +- MCGalaxy/Commands/Information/CmdAfk.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MCGalaxy/Commands/Chat/MessageCmd.cs b/MCGalaxy/Commands/Chat/MessageCmd.cs index e5a14fc5e..00939414b 100644 --- a/MCGalaxy/Commands/Chat/MessageCmd.cs +++ b/MCGalaxy/Commands/Chat/MessageCmd.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands { if (!TryMessage(p, string.Format(message, giver, who.ColoredName))) return false; string giverRaw = (p == null) ? "(console)" : p.name; - if (messageWho && !who.listignored.Contains(giverRaw)) + if (messageWho && !who.listignored.Contains(giverRaw) && !who.ignoreAll) Player.Message(who, string.Format(message, giver, "you")); return true; } diff --git a/MCGalaxy/Commands/Information/CmdAfk.cs b/MCGalaxy/Commands/Information/CmdAfk.cs index d6cb6449d..f7058b623 100644 --- a/MCGalaxy/Commands/Information/CmdAfk.cs +++ b/MCGalaxy/Commands/Information/CmdAfk.cs @@ -50,7 +50,7 @@ namespace MCGalaxy.Commands { Player.Message(p, "You are now marked as being AFK."); } else { Chat.MessageWhere("-{0}%S- is AFK {1}", - pl => Entities.CanSee(pl, p) && !pl.listignored.Contains(p.name), + pl => Entities.CanSee(pl, p) && !pl.listignored.Contains(p.name) && !pl.ignoreAll, p.ColoredName, message); Player.RaisePlayerAction(p, PlayerAction.AFK, message); p.CheckForMessageSpam(); @@ -65,7 +65,7 @@ namespace MCGalaxy.Commands { Player.Message(p, "You are no longer marked as being AFK."); } else { Chat.MessageWhere("-{0}%S- is no longer AFK", - pl => Entities.CanSee(pl, p) && !pl.listignored.Contains(p.name), + pl => Entities.CanSee(pl, p) && !pl.listignored.Contains(p.name) && !pl.ignoreAll, p.ColoredName); Player.RaisePlayerAction(p, PlayerAction.UnAFK, message); p.CheckForMessageSpam();