Skip to content

Commit 4f0b392

Browse files
committed
chore: minor stuff
1 parent 906e6ef commit 4f0b392

File tree

7 files changed

+7
-8
lines changed

7 files changed

+7
-8
lines changed

core/deployer/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export class Deployer {
122122
this.deployFailed = true;
123123
try {
124124
const filePath = path.join(this.deployPath, '_DEPLOY_FAILED_DO_NOT_USE');
125-
await fse.outputFile(filePath, 'This deploy was failed, please do not use these files.');
125+
await fse.outputFile(filePath, 'This deploy has failed, please do not use these files.');
126126
} catch (error) { }
127127
}
128128

core/modules/FxRunner/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ export default class FxRunner {
7373
return console.warn('The server will not auto start because there are no admins configured.');
7474
}
7575

76-
if(txConfig.server.quiet || txHostConfig.forceQuietMode){
77-
console.defer(1000).warn('FXServer Quiet mode is enabled. Access the Live Console to see the logs.');
76+
if (txConfig.server.quiet || txHostConfig.forceQuietMode) {
77+
console.defer(1000).warn('FXServer Quiet mode is enabled. Access the Live Console to see the logs.');
7878
}
7979

8080
this.spawnServer(true);

core/modules/FxScheduler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export default class FxScheduler {
118118
nextRelativeMs: false,
119119
nextSkip: false,
120120
nextIsTemp: false,
121-
};
121+
} as const;
122122
}
123123
}
124124

core/routes/advanced/actions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export default async function AdvancedActions(ctx) {
3838
if (action == 'change_verbosity') {
3939
console.setVerbose(parameter == 'true');
4040
//temp disabled because the verbosity convar is not being set by this method
41-
// txCore.fxRunner.updateMutableConvars();
4241
return ctx.send({ refresh: true });
4342
} else if (action == 'perform_magic') {
4443
const message = JSON.stringify(txCore.fxPlayerlist.getPlayerList(), null, 2);

nui/src/state/permissions.state.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export type ResolvablePermission =
99
| "players.playermode"
1010
| "players.teleport"
1111
| "players.heal"
12-
| "players.trollmenu"
1312
| "players.ban"
1413
| "players.kick"
1514
| "players.direct_message"
@@ -25,6 +24,7 @@ export type ResolvablePermission =
2524
| "server.log.view"
2625
| "menu.vehicle"
2726
| "menu.clear_area"
27+
| "menu.viewids"
2828
| "players.spectate"
2929
| "players.troll"
3030
| "players.freeze";

panel/src/pages/Dashboard/drawFullPerfChart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export default function drawFullPerfChart({
125125
.attr('transform', translate(width - margins.right + margins.axis, margins.top))
126126
.call(bucketsAxis);
127127

128-
const playersAxisTickValues = (maxPlayers <= 7) ? d3.range(maxPlayers + 1) : null;
128+
const playersAxisTickValues = (maxPlayersDomain <= 7) ? d3.range(maxPlayersDomain + 1) : null;
129129
const playersAxis = d3.axisLeft(playersScale)
130130
.tickFormat(t => t.toString())
131131
.tickValues(playersAxisTickValues as any); //integer values only

resource/sv_main.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TX_ADMINS = {}
2727
TX_PLAYERLIST = {}
2828
TX_LUACOMHOST = GetConvar("txAdmin-luaComHost", "invalid")
2929
TX_LUACOMTOKEN = GetConvar("txAdmin-luaComToken", "invalid")
30-
TX_VERSION = GetResourceMetadata(GetCurrentResourceName(), 'version') -- for now, only used in the start print
30+
TX_VERSION = GetResourceMetadata('monitor', 'version') -- for now, only used in the start print
3131
TX_IS_SERVER_SHUTTING_DOWN = false
3232

3333
-- Checking convars

0 commit comments

Comments
 (0)