From eabf63cf86035eba0ac128afaaa9f48a9014ed80 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 31 May 2022 08:34:35 -0500
Subject: [PATCH] Fix closest NPC to check interior and dimension

---
 scripts/server/npc.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/server/npc.js b/scripts/server/npc.js
index 536ae921..bb646408 100644
--- a/scripts/server/npc.js
+++ b/scripts/server/npc.js
@@ -473,9 +473,13 @@ function getNPCInfoCommand(command, params, client) {
 
 function getClosestNPC(position) {
 	let npcs = getServerData().npcs;
+
+	let interior = getPlayerInterior(client);
+	let dimension = getPlayerDimension(client);
+
 	let closest = 0;
 	for(let i in npcs) {
-		if(getDistance(npcs[i].ped.position, position) < getDistance(npcs[closest].ped.position, position)) {
+		if(getDistance(npcs[i].ped.position, position) < getDistance(npcs[closest].ped.position, position) && npcs[closest].interior == interior && npcs[closest].dimension == dimension) {
 			closest = i;
 		}
 	}