AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow doing /client help of singleplayer only commands in multiplayer

Browse Source
This commit is contained in:
UnknownShadow200 2020-05-27 11:03:37 +10:00
parent e56b58364a
commit 838cbfa30c
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Chat.c
View File

@ -261,15 +261,6 @@ static struct ChatCommand* Commands_FindMatch(const String* cmdName) {
return match;
}
static struct ChatCommand* Commands_GetMatch(const String* cmdName) {
struct ChatCommand* cmd = Commands_FindMatch(cmdName);
if (cmd && cmd->SingleplayerOnly && !Server.IsSinglePlayer) {
Chat_Add1("&e/client: \"&f%s&e\" can only be used in singleplayer.", cmdName);
return NULL;
}
return cmd;
}
static void Commands_PrintDefault(void) {
String str; char strBuffer[STRING_SIZE];
String name;
@ -315,8 +306,14 @@ static void Commands_Execute(const String* input) {
if (!text.length) { Commands_PrintDefault(); return; }
count = String_UNSAFE_Split(&text, ' ', args, Array_Elems(args));
cmd = Commands_GetMatch(&args[0]);
if (cmd) cmd->Execute(&args[1], count - 1);
cmd = Commands_FindMatch(&args[0]);
if (!cmd) return;
if (cmd->SingleplayerOnly && !Server.IsSinglePlayer) {
Chat_Add1("&e/client: \"&f%s&e\" can only be used in singleplayer.", &args[0]);
return;
}
cmd->Execute(&args[1], count - 1);
}
@ -328,7 +325,7 @@ static void HelpCommand_Execute(const String* args, int argsCount) {
int i;
if (!argsCount) { Commands_PrintDefault(); return; }
cmd = Commands_GetMatch(&args[0]);
cmd = Commands_FindMatch(&args[0]);
if (!cmd) return;
for (i = 0; i < Array_Elems(cmd->Help); i++) {