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

Fix player info cmd job and clan rank info

Browse Source
This commit is contained in:
Vortrex
2022-08-01 11:35:44 -05:00
parent f301469072
commit 5be864f77c
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/server/misc.js
View File

@@ -404,7 +404,7 @@ function getPlayerInfoCommand(command, params, client) {
if (doesPlayerHaveStaffPermission(client, getStaffFlagValue("BasicModeration"))) { if (doesPlayerHaveStaffPermission(client, getStaffFlagValue("BasicModeration"))) {
targetClient = getPlayerFromParams(params); targetClient = getPlayerFromParams(params);
if (!getPlayerData(targetClient)) { if (!targetClient) {
messagePlayerError(client, getLocaleString(client, "InvalidPlayer")); messagePlayerError(client, getLocaleString(client, "InvalidPlayer"));
return false; return false;
} }
@@ -418,13 +418,18 @@ function getPlayerInfoCommand(command, params, client) {
let clanData = getClanData(clanIndex); let clanData = getClanData(clanIndex);
let clanRankData = getClanRankData(clanIndex, clanRankIndex); let clanRankData = getClanRankData(clanIndex, clanRankIndex);
let jobIndex = getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(targetClient).job); let jobIndex = getPlayerCurrentSubAccount(targetClient).jobIndex;
let jobRankIndex = getJobRankIndexFromDatabaseId(jobIndex, getPlayerCurrentSubAccount(targetClient).jobRank); let jobRankIndex = getPlayerCurrentSubAccount(targetClient).jobRankIndex;
let jobData = getJobData(jobIndex); let jobData = getJobData(jobIndex);
let jobRankData = getJobRankData(jobIndex, jobRankIndex);
let jobRankText = "(Rank: None)";
if (jobRankIndex != -1) {
let jobRankData = getJobRankData(jobIndex, jobRankIndex);
jobRankText = `(Rank ${jobRankData.level}: ${jobRankData.name}{mediumGrey}[${jobRankData.databaseId}]{ALTCOLOUR})`;
}
let clan = (getPlayerCurrentSubAccount(targetClient).clan != 0) ? `{ALTCOLOUR}${clanData.name}{mediumGrey}[${clanData.databaseId}]{ALTCOLOUR} (Rank ${clanRankData.level}: ${clanRankData.name}{mediumGrey}[${clanRankData.databaseId}]{ALTCOLOUR})` : `None`; let clan = (getPlayerCurrentSubAccount(targetClient).clan != 0) ? `{ALTCOLOUR}${clanData.name}{mediumGrey}[${clanData.databaseId}]{ALTCOLOUR} (Rank ${clanRankData.level}: ${clanRankData.name}{mediumGrey}[${clanRankData.databaseId}]{ALTCOLOUR})` : `None`;
let job = (getPlayerCurrentSubAccount(targetClient).job != 0) ? `{ALTCOLOUR}${jobData.name}{mediumGrey}[${jobData.databaseId}]{ALTCOLOUR} (Rank ${jobRankData.level}: ${jobRankData.name}{mediumGrey}[${jobRankData.databaseId}]{ALTCOLOUR})` : `None`; let job = (getPlayerCurrentSubAccount(targetClient).jobIndex != -1) ? `{ALTCOLOUR}${jobData.name}{mediumGrey}[${jobData.databaseId}]{ALTCOLOUR} ${jobRankText}` : `None`;
let skinIndex = getPlayerCurrentSubAccount(targetClient).skin; let skinIndex = getPlayerCurrentSubAccount(targetClient).skin;
let skinModel = getGameConfig().skins[getGame()][skinIndex][0]; let skinModel = getGameConfig().skins[getGame()][skinIndex][0];
let skinName = getSkinNameFromModel(skinModel); let skinName = getSkinNameFromModel(skinModel);
@@ -858,11 +863,15 @@ function createPlayerBlip(client) {
let blip = createAttachedGameBlip(getPlayerPed(client), 0, 1, getPlayerColour(client)); let blip = createAttachedGameBlip(getPlayerPed(client), 0, 1, getPlayerColour(client));
if (blip) { if (blip) {
if (getGlobalConfig().playerBlipStreamInDistance == -1 || getGlobalConfig().playerBlipStreamOutDistance == -1) { if (getGlobalConfig().playerBlipStreamInDistance == -1 || getGlobalConfig().playerBlipStreamOutDistance == -1) {
blip.netFlags.distanceStreaming = false; //getPlayerPed(client).netFlags.distanceStreaming = false;
getPlayerPed(client).streamInDistance = 999998;
getPlayerPed(client).streamOutDistance = 999999;
} else { } else {
setElementStreamInDistance(blip, getGlobalConfig().playerBlipStreamInDistance); //getPlayerPed(client).netFlags.distanceStreaming = true;
setElementStreamOutDistance(blip, getGlobalConfig().playerBlipStreamOutDistance); setElementStreamInDistance(getPlayerPed(client), getGlobalConfig().playerBlipStreamInDistance);
setElementStreamOutDistance(getPlayerPed(client), getGlobalConfig().playerBlipStreamOutDistance);
} }
//getPlayerPed(client).netFlags.defaultExistance = true;
blip.netFlags.defaultExistance = true; blip.netFlags.defaultExistance = true;
blip.setExistsFor(client, false); blip.setExistsFor(client, false);
getPlayerData(client).playerBlip = blip; getPlayerData(client).playerBlip = blip;