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

Remove debug logs and add check for int on enter

Browse Source
This commit is contained in:
Vortrex
2020-12-21 09:25:58 -06:00
parent 2facb98166
commit e2d91a3e8b
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/misc.js
View File

@@ -121,8 +121,6 @@ function enterExitPropertyCommand(command, params, client) {
return true; return true;
} }
console.log("Not in a house.");
if(isPlayerInAnyBusiness(client)) { if(isPlayerInAnyBusiness(client)) {
let inBusiness = getServerData().businesses[getPlayerBusiness(client)]; let inBusiness = getServerData().businesses[getPlayerBusiness(client)];
if(getDistance(inBusiness.exitPosition, getPlayerPosition(client)) <= getServerConfig().exitPropertyDistance) { if(getDistance(inBusiness.exitPosition, getPlayerPosition(client)) <= getServerConfig().exitPropertyDistance) {
@@ -138,16 +136,21 @@ function enterExitPropertyCommand(command, params, client) {
return true; return true;
} }
console.log("Not in a business.");
if(getServerData().businesses.length > 0) { if(getServerData().businesses.length > 0) {
let closestBusinessId = getClosestBusinessEntrance(getPlayerPosition(client)); let closestBusinessId = getClosestBusinessEntrance(getPlayerPosition(client));
let closestBusiness = getBusinessData(closestBusinessId) let closestBusiness = getBusinessData(closestBusinessId)
if(getDistance(closestBusiness.entrancePosition, getPlayerPosition(client)) <= getServerConfig().enterPropertyDistance) { if(getDistance(closestBusiness.entrancePosition, getPlayerPosition(client)) <= getServerConfig().enterPropertyDistance) {
if(doesBusinessHaveInterior(closestBusinessId)) {
messageClientAlert(client, "This business does not have an interior.");
messageClientTip(client, "You can use business commands at the door.");
return false;
}
if(closestBusiness.locked) { if(closestBusiness.locked) {
meActionToNearbyPlayers(client, "tries to open the business door but fails because it's locked"); meActionToNearbyPlayers(client, "tries to open the business door but fails because it's locked");
return false; return false;
} }
meActionToNearbyPlayers(client, "opens the door and enters the business"); meActionToNearbyPlayers(client, "opens the door and enters the business");
triggerNetworkEvent("ag.enterProperty", client, closestBusiness.exitPosition, closestBusiness.exitRotation, closestBusiness.exitInterior, closestBusinessId+getServerConfig().businessDimensionStart); triggerNetworkEvent("ag.enterProperty", client, closestBusiness.exitPosition, closestBusiness.exitRotation, closestBusiness.exitInterior, closestBusinessId+getServerConfig().businessDimensionStart);
client.player.dimension = closestBusiness.exitDimension; client.player.dimension = closestBusiness.exitDimension;
@@ -156,8 +159,6 @@ function enterExitPropertyCommand(command, params, client) {
} }
} }
console.log("Not near a business entrance.");
if(getServerData().houses.length > 0) { if(getServerData().houses.length > 0) {
let closestHouseId = getClosestHouseEntrance(getPlayerPosition(client)); let closestHouseId = getClosestHouseEntrance(getPlayerPosition(client));
//console.log(closestHouseId); //console.log(closestHouseId);
@@ -165,10 +166,17 @@ function enterExitPropertyCommand(command, params, client) {
//let distance = getDistance(closestHouse.entrancePosition, getPlayerPosition(client)); //let distance = getDistance(closestHouse.entrancePosition, getPlayerPosition(client));
//console.log(`Distance to closest house door: ${distance}`); //console.log(`Distance to closest house door: ${distance}`);
if(getDistance(closestHouse.entrancePosition, getPlayerPosition(client)) <= getServerConfig().enterPropertyDistance) { if(getDistance(closestHouse.entrancePosition, getPlayerPosition(client)) <= getServerConfig().enterPropertyDistance) {
if(doesHouseHaveInterior(closestHouseId)) {
messageClientAlert(client, "This house does not have an interior.");
messageClientTip(client, "You can use house commands at the door.");
return false;
}
if(closestHouse.locked) { if(closestHouse.locked) {
meActionToNearbyPlayers(client, "tries to open the house door but fails because it's locked"); meActionToNearbyPlayers(client, "tries to open the house door but fails because it's locked");
return false; return false;
} }
meActionToNearbyPlayers(client, "opens the door and enters the house"); meActionToNearbyPlayers(client, "opens the door and enters the house");
triggerNetworkEvent("ag.enterProperty", client, closestHouse.exitPosition, closestHouse.exitRotation, closestHouse.exitInterior, closestHouse+getServerConfig().houseDimensionStart); triggerNetworkEvent("ag.enterProperty", client, closestHouse.exitPosition, closestHouse.exitRotation, closestHouse.exitInterior, closestHouse+getServerConfig().houseDimensionStart);
//client.player.dimension = closestHouse.exitDimension; //client.player.dimension = closestHouse.exitDimension;