hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some command utils

Browse Source
This commit is contained in:
Vortrex
2022-04-12 06:31:54 -05:00
parent e1c6f66183
commit c91944e36a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/server/command.js
View File

@@ -534,12 +534,16 @@ function loadCommands() {
// ===========================================================================
function addAllCommandHandlers() {
let commandCount = 0;
for(let i in serverCommands) {
for(let j in serverCommands[i]) {
logToConsole(LOG_VERBOSE, `Adding command handler for ${i}/${j} - ${serverCommands[i][j].command}`);
logToConsole(LOG_DEBUG, `[VRR.Command] Adding command handler for ${i} - ${serverCommands[i][j].command}`);
addCommandHandler(serverCommands[i][j].command, processPlayerCommand);
commandCount++;
}
}
logToConsole(LOG_INFO, `[VRR.Command] ${commandCount} command handlers added!`);
}
// ===========================================================================
@@ -782,7 +786,7 @@ function getAllCommandsInSingleArray() {
let tempCommands = [];
for(let i in serverCommands) {
for(let j in serverCommands[i]) {
tempCommands.push(serverCommands[i][j]);
tempCommands.push(serverCommands[i][j].command);
}
}
@@ -791,10 +795,12 @@ function getAllCommandsInSingleArray() {
// ===========================================================================
function getAllCommandsInGroupInSingleArray(groupName) {
function getAllCommandsInGroupInSingleArray(groupName, staffFlag = "None") {
let tempCommands = [];
for(let i in serverCommands[groupName]) {
tempCommands.push(serverCommands[groupName][i]);
if(getCommandRequiredPermissions(serverCommands[groupName][i].command) == 0) {
tempCommands.push(serverCommands[groupName][i].command);
}
}
return tempCommands;
@@ -806,9 +812,9 @@ function getAllCommandsForStaffFlagInSingleArray(staffFlagName) {
let tempCommands = [];
for(let i in serverCommands) {
for(let j in serverCommands[i]) {
if(serverCommands[i][j].requiredStaffFlags != "0") {
if(hasBitFlag(serverCommands[i][j].requiredStaffFlags, getStaffFlagValue(staffFlagName))) {
tempCommands.push(serverCommands[i][j]);
if(getCommandRequiredPermissions(serverCommands[i][j].command) != 0) {
if(hasBitFlag(getCommandRequiredPermissions(serverCommands[i][j].command), getStaffFlagValue(staffFlagName))) {
tempCommands.push(serverCommands[i][j].command);
}
}
}