From e050c11b553d9601806371c79047e6761f6eeaae Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 11 Dec 2021 20:15:01 -0600
Subject: [PATCH] Fix bitflag utils

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

diff --git a/scripts/server/bitflag.js b/scripts/server/bitflag.js
index bc12e2fb..1d5c164c 100644
--- a/scripts/server/bitflag.js
+++ b/scripts/server/bitflag.js
@@ -262,9 +262,10 @@ function hasBitFlag(allFlags, checkForFlag) {
 		return true;
 	}
 
-	if(allFlags & checkForFlag == allFlags) {
+	if((allFlags & checkForFlag) == allFlags) {
 		return true;
 	}
+
 	return false;
 }
 
@@ -289,7 +290,7 @@ function doesPlayerHaveStaffPermission(client, requiredFlags) {
         return true;
     }
 
-    if(staffFlags & requiredFlags) {
+    if(hasBitFlag(staffFlags, requiredFlags)) {
         return true;
     }
 
@@ -319,7 +320,7 @@ function doesPlayerHaveClanPermission(client, requiredFlags) {
         return true;
     }
 
-    if(clanFlags & requiredFlags) {
+    if(hasBitFlag(clanFlags, requiredFlags)) {
         return true;
     }
 
@@ -407,13 +408,15 @@ function takePlayerStaffFlag(client, flagName) {
 // ===========================================================================
 
 function addBitFlag(allFlags, flagValue) {
-	return allFlags | flagValue;
+	allFlags |= flagValue;
+	return;
 }
 
 // ===========================================================================
 
 function removeBitFlag(allFlags, flagValue) {
-	return allFlags & ~flagValue;
+	allFlags ^= flagValue;
+	return;
 }
 
 // ===========================================================================