From 7aac32930c378972fffd6509c698ee69dfd5414d Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 4 Jan 2022 20:02:07 -0600
Subject: [PATCH] Use bitflag util

---
 scripts/server/bitflag.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/server/bitflag.js b/scripts/server/bitflag.js
index a29b49cb..80c66fa9 100644
--- a/scripts/server/bitflag.js
+++ b/scripts/server/bitflag.js
@@ -434,11 +434,12 @@ function givePlayerStaffFlag(client, flagName) {
 // ===========================================================================
 
 function takePlayerStaffFlag(client, flagName) {
-	if(!getStaffFlagValue(flagName)) {
+	let flagValue = getStaffFlagValue(flagName);
+	if(!flagValue) {
 		return false;
 	}
 
-	getPlayerData(client).accountData.flags.admin = getPlayerData(client).accountData.flags.admin & ~getStaffFlagValue(flagName);
+	getPlayerData(client).accountData.flags.admin = removeBitFlag(getPlayerData(client).accountData.flags.admin, flagValue);
 	return true;
 }