AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 03:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /cuboid [block] yes not persisting (Thanks Goodly)

Browse Source
This commit is contained in:
UnknownShadow200 2021-08-07 12:03:01 +10:00
parent 63316d405a
commit 1ca308f23d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Chat.c
View File

@ -488,10 +488,15 @@ static IVec3 cuboid_mark1, cuboid_mark2;
static cc_bool cuboid_persist, cuboid_hooked, cuboid_hasMark1; static cc_bool cuboid_persist, cuboid_hooked, cuboid_hasMark1;
static const cc_string cuboid_msg = String_FromConst("&eCuboid: &fPlace or delete a block."); static const cc_string cuboid_msg = String_FromConst("&eCuboid: &fPlace or delete a block.");
static cc_bool CuboidCommand_ParseBlock(const cc_string* args, int argsCount) { static cc_bool CuboidCommand_ParseArgs(const cc_string* args, int argsCount) {
int block; int block;
if (!argsCount) return true; if (!argsCount) return true;
if (String_CaselessEqualsConst(&args[0], "yes")) { cuboid_persist = true; return true; }
if (String_CaselessEqualsConst(&args[argsCount - 1], "yes")) {
cuboid_persist = true;
/* special case "/cuboid yes" */
if (argsCount == 1) return true;
}
block = Block_Parse(&args[0]); block = Block_Parse(&args[0]);
if (block == -1) { if (block == -1) {
@ -563,11 +568,7 @@ static void CuboidCommand_Execute(const cc_string* args, int argsCount) {
cuboid_block = -1; cuboid_block = -1;
cuboid_hasMark1 = false; cuboid_hasMark1 = false;
cuboid_persist = false; cuboid_persist = false;
if (!CuboidCommand_ParseArgs(args, argsCount)) return;
if (!CuboidCommand_ParseBlock(args, argsCount)) return;
if (argsCount > 1 && String_CaselessEqualsConst(&args[0], "yes")) {
cuboid_persist = true;
}
Chat_AddOf(&cuboid_msg, MSG_TYPE_CLIENTSTATUS_1); Chat_AddOf(&cuboid_msg, MSG_TYPE_CLIENTSTATUS_1);
Event_Register_(&UserEvents.BlockChanged, NULL, CuboidCommand_BlockChanged); Event_Register_(&UserEvents.BlockChanged, NULL, CuboidCommand_BlockChanged);