Update TextCommand.cs

uEssentials · Sep 26, 2016 · a5340c3 · a5340c3
1 parent a4d125d
commit a5340c3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Core/Command/TextCommand.cs b/src/Core/Command/TextCommand.cs
@@ -44,7 +44,7 @@ internal class TextCommand : ICommand {
         public AllowedSource AllowedSource { get; set; }
 
         private readonly List<CommandEntry> _commands;
-        private readonly List<TextEntry> _texts; 
+        private readonly List<TextEntry> _texts;
 
         public TextCommand(TextCommands.TextCommandData data) {
             _texts = new List<TextEntry>();
@@ -78,15 +78,19 @@ public TextCommand(TextCommands.TextCommandData data) {
 
         public CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
             foreach (var entry in _texts) {
-                src.SendMessage(entry.Text, entry.Color);
+                src.SendMessage(ReplaceVariables(entry.Text, src, args), entry.Color);
             }
             foreach (var entry in _commands) {
                 var source = entry.IsConsoleExecutor ? UEssentials.ConsoleSource : src;
-                source.DispatchCommand(entry.Command);
+                source.DispatchCommand(ReplaceVariables(entry.Command, src, args));
             }
             return CommandResult.Success();
         }
 
+        private string ReplaceVariables(string text, ICommandSource src, ICommandArgs args) {
+            return text.Replace("%sender%", src.DisplayName);
+        }
+
         private struct TextEntry {
             public string Text;
             public Color Color;