Skip to content

Commit a968e12

Browse files
committed
Add Prefix as Tag
1 parent 7b43f1b commit a968e12

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

CustomCommands/Commands.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"Title": "Discord",
44
"Command": "discord",
5-
"Message": "{GREEN}Discord: <link>",
5+
"Message": "{PREFIX}{GREEN}Discord: <link>",
66
"CenterMessage": "",
77
"PrintTo": 0,
88
"Description": "Command for Discord"

CustomCommands/CustomCommands.cs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public override void Load(bool hotReload)
5959
switch (com.PrintTo)
6060
{
6161
case Sender.ClientChat:
62-
player.PrintToChat(Config.Prefix + message);
62+
player.PrintToChat(message);
6363

6464
break;
6565
case Sender.AllChat:
66-
Server.PrintToChatAll(Config.Prefix + message);
66+
Server.PrintToChatAll(message);
6767

6868
break;
6969
case Sender.ClientCenter:
@@ -76,23 +76,23 @@ public override void Load(bool hotReload)
7676

7777
break;
7878
case Sender.ClientChatClientCenter:
79-
player.PrintToChat(Config.Prefix + message);
79+
player.PrintToChat(message);
8080
player.PrintToCenterHtml(com.CenterMessage);
8181

8282
break;
8383
case Sender.ClientChatAllCenter:
84-
player.PrintToChat(Config.Prefix + message);
84+
player.PrintToChat(message);
8585
foreach (var controller in PlayerList)
8686
controller.PrintToCenterHtml(com.CenterMessage);
8787

8888
break;
8989
case Sender.AllChatClientCenter:
90-
Server.PrintToChatAll(Config.Prefix + message);
90+
Server.PrintToChatAll(message);
9191
player.PrintToCenterHtml(com.CenterMessage);
9292

9393
break;
9494
case Sender.AllChatAllCenter:
95-
Server.PrintToChatAll(Config.Prefix + message);
95+
Server.PrintToChatAll(message);
9696
foreach (var controller in PlayerList)
9797
controller.PrintToCenterHtml(com.CenterMessage);
9898

@@ -111,21 +111,22 @@ public override void Load(bool hotReload)
111111
InitializeLists();
112112
}
113113

114-
private string ReplaceColorTags(string input)
114+
115+
private string ReplaceTags(string input)
115116
{
116-
string[] colorPatterns =
117+
string[] patterns =
117118
{
118-
"{DEFAULT}", "{RED}", "{LIGHTPURPLE}", "{GREEN}", "{LIME}", "{LIGHTGREEN}", "{LIGHTRED}", "{GRAY}",
119+
"{PREFIX}", "{DEFAULT}", "{RED}", "{LIGHTPURPLE}", "{GREEN}", "{LIME}", "{LIGHTGREEN}", "{LIGHTRED}", "{GRAY}",
119120
"{LIGHTOLIVE}", "{OLIVE}", "{LIGHTBLUE}", "{BLUE}", "{PURPLE}", "{GRAYBLUE}"
120121
};
121-
string[] colorReplacements =
122+
string[] replacements =
122123
{
123-
"\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\x09", "\x10", "\x0B", "\x0C", "\x0E",
124+
ReplaceTags(Config.Prefix) ,"\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\x09", "\x10", "\x0B", "\x0C", "\x0E",
124125
"\x0A"
125126
};
126127

127-
for (var i = 0; i < colorPatterns.Length; i++)
128-
input = input.Replace(colorPatterns[i], colorReplacements[i]);
128+
for (var i = 0; i < patterns.Length; i++)
129+
input = input.Replace(patterns[i], replacements[i]);
129130

130131
return input;
131132
}

0 commit comments

Comments
 (0)