From 7139f0e4bc9bf10441929cda86e75aad14846840 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 10 Aug 2022 14:17:30 -0500
Subject: [PATCH] Show name of house/biz when entering/exiting

---
 scripts/server/misc.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index 31db0417..aab6430b 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -272,6 +272,10 @@ function enterExitPropertyCommand(command, params, client) {
 
 	logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)}'s closest door is ${(isBusiness) ? closestProperty.name : closestProperty.description} ${(isEntrance) ? "entrance" : "exit"}`);
 
+	let englishId = getLocaleFromParams("English");
+	let typeString = (isBusiness) ? getLocaleString(client, "Business") : getLocaleString(client, "House");
+	let nameString = (isBusiness) ? closestProperty.name : closestProperty.description;
+
 	if (isEntrance) {
 		if (getDistance(closestProperty.entrancePosition, getPlayerPosition(client)) <= getGlobalConfig().enterPropertyDistance) {
 			if (closestProperty.locked) {
@@ -286,7 +290,8 @@ function enterExitPropertyCommand(command, params, client) {
 
 			clearPlayerStateToEnterExitProperty(client);
 			getPlayerData(client).pedState = AGRP_PEDSTATE_ENTERINGPROPERTY;
-			meActionToNearbyPlayers(client, getLocaleString(client, "EntersProperty", (isBusiness) ? getLocaleString(client, "Business") : getLocaleString(client, "House")));
+
+			meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "EntersProperty", typeString, nameString));
 
 			if (isFadeCameraSupported()) {
 				fadeCamera(client, false, 1.0);
@@ -331,8 +336,9 @@ function enterExitPropertyCommand(command, params, client) {
 				return false;
 			}
 			getPlayerData(client).pedState = AGRP_PEDSTATE_EXITINGPROPERTY;
-			clearPlayerStateToEnterExitProperty(client)
-			meActionToNearbyPlayers(client, getLocaleString(client, "ExitsProperty", (isBusiness) ? getLocaleString(client, "Business") : getLocaleString(client, "House")));
+			clearPlayerStateToEnterExitProperty(client);
+
+			meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "ExitsProperty", typeString, nameString));
 
 			if (isFadeCameraSupported()) {
 				fadeCamera(client, false, 1.0);