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

Use INT and VW in closest NPC util

Browse Source
This commit is contained in:
Vortrex
2022-06-12 09:19:39 -05:00
parent 6c0bf2d881
commit 50f6ebe6a6
1 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/server/npc.js
View File

@@ -297,7 +297,7 @@ function spawnAllNPCs() {
// =========================================================================== // ===========================================================================
function deleteNPCCommand(command, params, client) { function deleteNPCCommand(command, params, client) {
let closestNPC = getClosestNPC(getPlayerPosition(client)); let closestNPC = getClosestNPC(getPlayerPosition(client), getPlayerDimension(client), getPlayerInterior(client));
if (!getNPCData(closestNPC)) { if (!getNPCData(closestNPC)) {
messagePlayerError(client, getLocaleString(client, "InvalidNPC")); messagePlayerError(client, getLocaleString(client, "InvalidNPC"));
@@ -333,7 +333,7 @@ function setNPCAnimationCommand(command, params, client) {
return false; return false;
} }
let closestNPC = getClosestNPC(getPlayerPosition(client)); let closestNPC = getClosestNPC(getPlayerPosition(client), getPlayerDimension(client), getPlayerInterior(client));
let animationId = getAnimationFromParams(getParam(params, " ", 1)); let animationId = getAnimationFromParams(getParam(params, " ", 1));
let animationPositionOffset = 1; let animationPositionOffset = 1;
@@ -370,7 +370,7 @@ function setNPCNameCommand(command, params, client) {
return false; return false;
} }
let closestNPC = getClosestNPC(getPlayerPosition(client)); let closestNPC = getClosestNPC(getPlayerPosition(client), getPlayerDimension(client), getPlayerInterior(client));
let name = params; let name = params;
if (!getNPCData(closestNPC)) { if (!getNPCData(closestNPC)) {
@@ -389,7 +389,7 @@ function setNPCNameCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function toggleNPCLookAtClosestPlayerCommand(command, params, client) { function toggleNPCLookAtClosestPlayerCommand(command, params, client) {
let closestNPC = getClosestNPC(getPlayerPosition(client)); let closestNPC = getClosestNPC(getPlayerPosition(client), getPlayerDimension(client), getPlayerInterior(client));
if (!getNPCData(closestNPC)) { if (!getNPCData(closestNPC)) {
messagePlayerError(client, getLocaleString(client, "InvalidNPC")); messagePlayerError(client, getLocaleString(client, "InvalidNPC"));
@@ -471,12 +471,9 @@ function getNPCInfoCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function getClosestNPC(position) { function getClosestNPC(position, interior, dimension) {
let npcs = getServerData().npcs; let npcs = getServerData().npcs;
let interior = getPlayerInterior(client);
let dimension = getPlayerDimension(client);
let closest = 0; let closest = 0;
for (let i in npcs) { for (let i in npcs) {
if (getDistance(npcs[i].ped.position, position) < getDistance(npcs[closest].ped.position, position) && npcs[closest].interior == interior && npcs[closest].dimension == dimension) { if (getDistance(npcs[i].ped.position, position) < getDistance(npcs[closest].ped.position, position) && npcs[closest].interior == interior && npcs[closest].dimension == dimension) {