mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 01:11:29 +00:00
[Hotfix] Fix merge issue
This commit is contained in:
parent
6b5e4afd2d
commit
fb2df0e570
@ -139,19 +139,19 @@ void command_logs(Client *c, const Seperator *sep)
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string gmsay_string = JoinString(gmsay, "-");
|
std::string gmsay_string = Strings::Join(gmsay, "-");
|
||||||
std::string console_string = JoinString(console, "-");
|
std::string console_string = Strings::Join(console, "-");
|
||||||
std::string file_string = JoinString(file, "-");
|
std::string file_string = Strings::Join(file, "-");
|
||||||
std::string discord_string = JoinString(discord, "-");
|
std::string discord_string = Strings::Join(discord, "-");
|
||||||
|
|
||||||
c->Message(
|
c->Message(
|
||||||
0,
|
0,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"G [{}] C [{}] F [{}] D [{}] [{}] [{}] ",
|
"G [{}] C [{}] F [{}] D [{}] [{}] [{}] ",
|
||||||
rtrim(gmsay_string, "-"),
|
Strings::RTrim(gmsay_string, "-"),
|
||||||
rtrim(console_string, "-"),
|
Strings::RTrim(console_string, "-"),
|
||||||
rtrim(file_string, "-"),
|
Strings::RTrim(file_string, "-"),
|
||||||
rtrim(discord_string, "-"),
|
Strings::RTrim(discord_string, "-"),
|
||||||
index,
|
index,
|
||||||
Logs::LogCategoryName[index]
|
Logs::LogCategoryName[index]
|
||||||
).c_str()
|
).c_str()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user