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

Only check dimension for prox chats

Browse Source
This commit is contained in:
Vortrex
2021-10-25 13:00:36 -05:00
parent 92de92d5ca
commit 30628a7e35
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/chat.js
View File

@@ -151,7 +151,7 @@ function clanChatCommand(command, params, client) {
function talkToNearbyPlayers(client, messageText) { function talkToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().talkDistance); let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().talkDistance);
for(let i in clients) { for(let i in clients) {
if(getPlayerInterior(client) == getPlayerInterior(clients[i] && getPlayerDimension(client) == getPlayerDimension(clients[i]))) { if(getPlayerDimension(client) == getPlayerDimension(clients[i])) {
messagePlayerTalk(clients[i], client, messageText); messagePlayerTalk(clients[i], client, messageText);
} }
} }
@@ -180,7 +180,7 @@ function phoneIncomingToNearbyPlayers(client, messageText) {
function whisperToNearbyPlayers(client, messageText) { function whisperToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().talkDistance); let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().talkDistance);
for(let i in clients) { for(let i in clients) {
if(getPlayerInterior(client) == getPlayerInterior(clients[i]) && getPlayerDimension(client) == getPlayerDimension(clients[i])) { if(getPlayerDimension(client) == getPlayerDimension(clients[i])) {
messagePlayerWhisper(clients[i], client, messageText); messagePlayerWhisper(clients[i], client, messageText);
} }
} }
@@ -191,7 +191,7 @@ function whisperToNearbyPlayers(client, messageText) {
function shoutToNearbyPlayers(client, messageText) { function shoutToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().shoutDistance); let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().shoutDistance);
for(let i in clients) { for(let i in clients) {
if(getPlayerInterior(client) == getPlayerInterior(clients[i]) && getPlayerDimension(client) == getPlayerDimension(clients[i])) { if(getPlayerDimension(client) == getPlayerDimension(clients[i])) {
messagePlayerShout(clients[i], client, messageText); messagePlayerShout(clients[i], client, messageText);
} }
} }
@@ -202,7 +202,7 @@ function shoutToNearbyPlayers(client, messageText) {
function megaphoneToNearbyPlayers(client, messageText) { function megaphoneToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().megaphoneDistance); let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().megaphoneDistance);
for(let i in clients) { for(let i in clients) {
if(getPlayerInterior(client) == getPlayerInterior(clients[i]) && getPlayerDimension(client) == getPlayerDimension(clients[i])) { if(getPlayerDimension(client) == getPlayerDimension(clients[i])) {
messagePlayerShout(clients[i], client, messageText); messagePlayerShout(clients[i], client, messageText);
} }
} }
@@ -213,7 +213,7 @@ function megaphoneToNearbyPlayers(client, messageText) {
function doActionToNearbyPlayers(client, messageText) { function doActionToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().doActionDistance); let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().doActionDistance);
for(let i in clients) { for(let i in clients) {
if(getPlayerInterior(client) == getPlayerInterior(clients[i]) && getPlayerDimension(client) == getPlayerDimension(clients[i])) { if(getPlayerDimension(client) == getPlayerDimension(clients[i])) {
messagePlayerDoAction(clients[i], client, messageText); messagePlayerDoAction(clients[i], client, messageText);
} }
} }
@@ -224,7 +224,7 @@ function doActionToNearbyPlayers(client, messageText) {
function meActionToNearbyPlayers(client, messageText) { function meActionToNearbyPlayers(client, messageText) {
let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().meActionDistance); let clients = getClientsInRange(getPlayerPosition(client), getGlobalConfig().meActionDistance);
for(let i in clients) { for(let i in clients) {
if(getPlayerInterior(client) == getPlayerInterior(clients[i]) && getPlayerDimension(client) == getPlayerDimension(clients[i])) { if(getPlayerDimension(client) == getPlayerDimension(clients[i])) {
messagePlayerMeAction(clients[i], client, messageText); messagePlayerMeAction(clients[i], client, messageText);
} }
} }
@@ -257,4 +257,6 @@ function canPlayerUseMegaphone(client) {
} }
return false; return false;
} }
// ===========================================================================