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

Remove debug log, send removed objs

Browse Source
This commit is contained in:
Vortrex
2020-12-24 19:37:54 -06:00
parent 7e95f75ba9
commit 8f9befa39e
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/misc.js
View File

@@ -22,7 +22,6 @@ function getPositionCommand(command, params, client) {
let position = client.player.position; let position = client.player.position;
messageClientNormal(client, `Your position is: ${position.x.toFixed(2)}, ${position.y.toFixed(2)}, ${position.z.toFixed(2)}`); messageClientNormal(client, `Your position is: ${position.x.toFixed(2)}, ${position.y.toFixed(2)}, ${position.z.toFixed(2)}`);
console.log(`Position: ${position.x.toFixed(2)}, ${position.y.toFixed(2)}, ${position.z.toFixed(2)}`);
return true; return true;
} }
@@ -140,7 +139,7 @@ function enterExitPropertyCommand(command, params, client) {
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)) { if(!doesBusinessHaveInterior(closestBusinessId)) {
messageClientAlert(client, "This business does not have an interior."); messageClientAlert(client, "This business does not have an interior.");
messageClientTip(client, "You can use business commands at the door."); messageClientTip(client, "You can use business commands at the door.");
return false; return false;
@@ -161,12 +160,10 @@ function enterExitPropertyCommand(command, params, client) {
if(getServerData().houses.length > 0) { if(getServerData().houses.length > 0) {
let closestHouseId = getClosestHouseEntrance(getPlayerPosition(client)); let closestHouseId = getClosestHouseEntrance(getPlayerPosition(client));
//console.log(closestHouseId);
let closestHouse = getHouseData(closestHouseId); let closestHouse = getHouseData(closestHouseId);
//let distance = getDistance(closestHouse.entrancePosition, getPlayerPosition(client)); //let distance = getDistance(closestHouse.entrancePosition, getPlayerPosition(client));
//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)) { if(!doesHouseHaveInterior(closestHouseId)) {
messageClientAlert(client, "This house does not have an interior."); messageClientAlert(client, "This house does not have an interior.");
messageClientTip(client, "You can use house commands at the door."); messageClientTip(client, "You can use house commands at the door.");
return false; return false;
@@ -190,4 +187,13 @@ function enterExitPropertyCommand(command, params, client) {
return true; return true;
} }
// ---------------------------------------------------------------------------
function sendRemovedWorldObjectsToPlayer(client) {
for(let i in getServerConfig().removedWorldObjects[getServerGame()]) {
console.log(`[Asshat.Misc] Sending removed world object ${i} (${getServerConfig().removedWorldObjects[getServerGame()][i].model}) to ${client.name}`);
triggerNetworkEvent("ag.removeWorldObject", client, getServerConfig().removedWorldObjects[getServerGame()][i].model, getServerConfig().removedWorldObjects[getServerGame()][i].position, getServerConfig().removedWorldObjects[getServerGame()][i].range);
}
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------