From 01d369f83842295081162cf7ff3419457154f45e Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 30 Nov 2021 21:53:34 -0600 Subject: [PATCH] Use bitflag utils --- scripts/server/clan.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/server/clan.js b/scripts/server/clan.js index 5894d6d9..7c25486c 100644 --- a/scripts/server/clan.js +++ b/scripts/server/clan.js @@ -627,7 +627,7 @@ function addClanRankFlagCommand(command, params, client) { let flagValue = getClanFlagValue(splitParams[1]); - getClanRankData(clanId, rankId).flags = getClanRankData(clanId, rankId).flags | flagValue; + getClanRankData(clanId, rankId).flags = addBitFlag(getClanRankData(clanId, rankId).flags, flagValue); messagePlayerSuccess(client, `You added the {ALTCOLOUR}${splitParams[1]} {MAINCOLOUR}clan flag to rank {ALTCOLOUR}${getClanRankData(clanId, rankId).name}`); } @@ -666,7 +666,7 @@ function removeClanRankFlagCommand(command, params, client) { let flagValue = getClanFlagValue(splitParams[1]); - getClanRankData(clanId, rankId).flags = getClanRankData(clanId, rankId).flags & ~flagValue; + getClanRankData(clanId, rankId).flags = removeBitFlag(getClanRankData(clanId, rankId).flags, flagValue); messagePlayerSuccess(client, `You removed the {ALTCOLOUR}${splitParams[1]} {MAINCOLOUR}clan flag from rank {ALTCOLOUR}${getClanRankData(clanId, rankId).name}`); } @@ -699,7 +699,7 @@ function showClanRankFlagsCommand(command, params, client) { } let currentFlags = getClanRankData(clanId, rankId).flags; - let clanFlagKeys = getServerBitFlagKeys().clanPermissionFlagKeys.filter((flagKey) => flagKey != "None"); + let clanFlagKeys = getServerBitFlagKeys().clanFlagKeys.filter((flagKey) => flagKey != "None"); let flagList = []; for(let i in clanFlagKeys) { if(hasBitFlag(currentFlags, getClanFlagValue(clanFlagKeys[i]))) {