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

Use command handlers instead of event

Browse Source
This commit is contained in:
Vortrex
2021-01-08 06:34:56 -06:00
parent dd562b5784
commit d0a1d7baa2
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/server/command.js
View File

@@ -28,6 +28,7 @@ let builtInCommands = [
function initCommandScript() { function initCommandScript() {
logToConsole(LOG_DEBUG, "[Asshat.Command]: Initializing commands script ..."); logToConsole(LOG_DEBUG, "[Asshat.Command]: Initializing commands script ...");
serverCommands = loadCommands(); serverCommands = loadCommands();
addAllCommandHandlers();
logToConsole(LOG_DEBUG, "[Asshat.Command]: Initialized commands script!"); logToConsole(LOG_DEBUG, "[Asshat.Command]: Initialized commands script!");
} }
@@ -148,8 +149,11 @@ function loadCommands() {
commandData("ccode", executeClientCodeCommand, "<code>", getStaffFlagValue("developer"), true, true), commandData("ccode", executeClientCodeCommand, "<code>", getStaffFlagValue("developer"), true, true),
commandData("gmx", restartGameModeCommand, "", getStaffFlagValue("developer"), true, true), commandData("gmx", restartGameModeCommand, "", getStaffFlagValue("developer"), true, true),
commandData("saveall", saveAllServerDataCommand, "", getStaffFlagValue("developer"), true, true), commandData("saveall", saveAllServerDataCommand, "", getStaffFlagValue("developer"), true, true),
commandData("docmd", simulateCommandForPlayer, "<player name/id> <command> [params]", getStaffFlagValue("developer"), true, true), commandData("docmd", simulateCommandForPlayerCommand, "<player name/id> <command> [params]", getStaffFlagValue("developer"), true, true),
commandData("docmdall", simulateCommandForAllPlayers, "<command> [params]", getStaffFlagValue("developer"), true, true), commandData("docmdall", simulateCommandForAllPlayersCommand, "<command> [params]", getStaffFlagValue("developer"), true, true),
commandData("docmdall", simulateCommandForAllPlayersCommand, "<command> [params]", getStaffFlagValue("developer"), true, true),
commandData("addloglvl", addServerLogLevelCommand, "<log level name>", getStaffFlagValue("developer"), true, true),
commandData("delloglvl", removeServerLogLevelCommand, "<log level name>", getStaffFlagValue("developer"), true, true),
], ],
discord: [], discord: [],
help: [ help: [
@@ -305,11 +309,18 @@ function loadCommands() {
commandData("vehcolour", setVehicleColourCommand, "<colour1> <colour2>", getStaffFlagValue("none"), true, true), commandData("vehcolour", setVehicleColourCommand, "<colour1> <colour2>", getStaffFlagValue("none"), true, true),
commandData("vehrepair", vehicleRepairCommand, "", getStaffFlagValue("none"), true, true), commandData("vehrepair", vehicleRepairCommand, "", getStaffFlagValue("none"), true, true),
commandData("passenger", enterVehicleAsPassengerCommand, "", getStaffFlagValue("none"), true, true), commandData("passenger", enterVehicleAsPassengerCommand, "", getStaffFlagValue("none"), true, true),
], ],
}; };
} }
function addAllCommandHandlers() {
for(let i in serverCommands) {
for(let j in serverCommands[i]) {
addCommandHandler(serverCommands[i][j].command, processPlayerCommand);
}
}
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getCommand(command) { function getCommand(command) {
@@ -457,7 +468,7 @@ function enableAllCommandsByType(command, params, client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function onPlayerCommand(event, client, command, params) { function onPlayerCommand(event, client, command, params) {
processPlayerCommand(command, params, client) //processPlayerCommand(command, params, client)
} }
addEventHandler("OnPlayerCommand", onPlayerCommand); addEventHandler("OnPlayerCommand", onPlayerCommand);
@@ -503,10 +514,12 @@ function processPlayerCommand(command, params, client) {
// } // }
//} //}
if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(toLowerCase(command)))) { if(!client.console) {
console.warn(`[Asshat.Command] ${getPlayerDisplayForConsole(client)} attempted to use command, but failed (no permission): /${command} ${paramsDisplay}`); if(!doesPlayerHaveStaffPermission(client, getCommandRequiredPermissions(toLowerCase(command)))) {
messagePlayerError(client, `You do not have permission to use the [#AAAAAA]/${toLowerCase(command)} [#FFFFFF]command!`); console.warn(`[Asshat.Command] ${getPlayerDisplayForConsole(client)} attempted to use command, but failed (no permission): /${command} ${paramsDisplay}`);
return false; messagePlayerError(client, `You do not have permission to use the [#AAAAAA]/${toLowerCase(command)} [#FFFFFF]command!`);
return false;
}
} }
logToConsole(LOG_DEBUG, `[Asshat.Command] ${getPlayerDisplayForConsole(client)} used command: /${command} ${paramsDisplay}`); logToConsole(LOG_DEBUG, `[Asshat.Command] ${getPlayerDisplayForConsole(client)} used command: /${command} ${paramsDisplay}`);