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

Fix staff flag cmds

Browse Source
This commit is contained in:
Vortrex
2022-01-04 20:04:10 -06:00
parent d67c8a0099
commit 90ab2f4819
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/server/moderation.js
View File

@@ -678,6 +678,11 @@ function addStaffFlagCommand(command, params, client) {
return false; return false;
} }
if(getStaffFlagValue(flagName) == false) {
messagePlayerError(client, "That staff flag doesn't exist!");
return false;
}
// Prevent setting flags on admins with really high permissions // Prevent setting flags on admins with really high permissions
if(doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("ManageServer")) || doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("Developer"))) { if(doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("ManageServer")) || doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("Developer"))) {
if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageServer")) && !doesPlayerHaveStaffPermission(client, getStaffFlagValue("Developer"))) { if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageServer")) && !doesPlayerHaveStaffPermission(client, getStaffFlagValue("Developer"))) {
@@ -686,11 +691,6 @@ function addStaffFlagCommand(command, params, client) {
} }
} }
if(!getStaffFlagValue(flagName)) {
messagePlayerError(client, "That staff flag doesn't exist!");
return false;
}
givePlayerStaffFlag(targetClient, flagName); givePlayerStaffFlag(targetClient, flagName);
messageAdmins(`${client.name} has {MAINCOLOUR}given {ALTCOLOUR}${getPlayerName(targetClient)} {MAINCOLOUR}the {ALTCOLOUR}${flagName} {MAINCOLOUR}staff flag`); messageAdmins(`${client.name} has {MAINCOLOUR}given {ALTCOLOUR}${getPlayerName(targetClient)} {MAINCOLOUR}the {ALTCOLOUR}${flagName} {MAINCOLOUR}staff flag`);
} }
@@ -712,6 +712,11 @@ function takeStaffFlagCommand(command, params, client) {
return false; return false;
} }
if(getStaffFlagValue(flagName) == false) {
messagePlayerError(client, "That staff flag doesn't exist!");
return false;
}
// Prevent setting flags on admins with really high permissions // Prevent setting flags on admins with really high permissions
if(doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("ManageServer")) || doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("Developer"))) { if(doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("ManageServer")) || doesPlayerHaveStaffPermission(targetClient, getStaffFlagValue("Developer"))) {
if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageServer")) && !doesPlayerHaveStaffPermission(client, getStaffFlagValue("Developer"))) { if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageServer")) && !doesPlayerHaveStaffPermission(client, getStaffFlagValue("Developer"))) {
@@ -720,11 +725,6 @@ function takeStaffFlagCommand(command, params, client) {
} }
} }
if(!getStaffFlagValue(flagName)) {
messagePlayerError(client, "That staff flag doesn't exist!");
return false;
}
takePlayerStaffFlag(targetClient, flagName); takePlayerStaffFlag(targetClient, flagName);
messageAdmins(`${client.name} {MAINCOLOUR}has taken the {ALTCOLOUR}${flagName} {MAINCOLOUR}staff flag from {ALTCOLOUR}${getPlayerName(targetClient)}`); messageAdmins(`${client.name} {MAINCOLOUR}has taken the {ALTCOLOUR}${flagName} {MAINCOLOUR}staff flag from {ALTCOLOUR}${getPlayerName(targetClient)}`);
} }
@@ -739,7 +739,6 @@ function clearStaffFlagsCommand(command, params, client) {
let splitParams = params.split(""); let splitParams = params.split("");
let targetClient = getPlayerFromParams(splitParams[0]); let targetClient = getPlayerFromParams(splitParams[0]);
let flagName = splitParams[1] || "None";
if(!targetClient) { if(!targetClient) {
messagePlayerError(client, "That player is not connected!"); messagePlayerError(client, "That player is not connected!");
@@ -754,11 +753,6 @@ function clearStaffFlagsCommand(command, params, client) {
} }
} }
if(!getStaffFlagValue(flagName)) {
messagePlayerError(client, "That staff flag doesn't exist!");
return false;
}
clearPlayerStaffFlags(targetClient); clearPlayerStaffFlags(targetClient);
messageAdmins(`${client.name} {MAINCOLOUR}removed all staff flags from {ALTCOLOUR}${getPlayerName(targetClient)}`); messageAdmins(`${client.name} {MAINCOLOUR}removed all staff flags from {ALTCOLOUR}${getPlayerName(targetClient)}`);
} }
@@ -809,7 +803,7 @@ function getStaffFlagsCommand(command, params, client) {
} }
} }
let chunkedList = splitArrayIntoChunks(flagList, 6); let chunkedList = splitArrayIntoChunks(flagList, 8);
messagePlayerInfo(client, `{clanOrange}== {jobYellow}Player Staff Flags {clanOrange}=========================`); messagePlayerInfo(client, `{clanOrange}== {jobYellow}Player Staff Flags {clanOrange}=========================`);