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

Fix radio msg not showing to nearby players

Browse Source
This commit is contained in:
Vortrex
2021-10-15 22:39:37 -05:00
parent 2968e10e7d
commit 4da3e1e187
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/server/item/walkie-talkie.js
View File

@@ -26,25 +26,25 @@ function getPlayerActiveWalkieTalkieFrequency(client) {
function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) { function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
walkieTalkieOutgoingToNearbyPlayers(transmittingPlayer, messageText); walkieTalkieOutgoingToNearbyPlayers(transmittingPlayer, messageText);
let clients = getServerData().items; //let clients = getServerData().items;
for(let i in clients) { //for(let i in clients) {
if(isPlayerSpawned(clients[i])) { // if(isPlayerSpawned(clients[i])) {
if(!isSamePlayer(transmittingPlayer, clients[i])) { // if(!isSamePlayer(transmittingPlayer, clients[i])) {
if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) { // if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
if(getItemData(getPlayerData(clients[i]).hotBarItems[getPlayerFirstItemSlotByUseType(clients[i], VRR_ITEM_USETYPE_WALKIETALKIE)]).enabled) { // if(getItemData(getPlayerData(clients[i]).hotBarItems[getPlayerFirstItemSlotByUseType(clients[i], VRR_ITEM_USETYPE_WALKIETALKIE)]).enabled) {
walkieTalkieIncomingToNearbyPlayers(clients[i], messageText); // walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
} // }
} // }
} // }
} // }
} //}
let items = getServerData().items; let items = getServerData().items;
for(let i in items) { for(let i in items) {
if(items[i].enabled) { if(items[i].enabled) {
if(getItemTypeData(items[i].itemTypeIndex).useType == VRR_ITEM_USETYPE_WALKIETALKIE) { if(getItemTypeData(items[i].itemTypeIndex).useType == VRR_ITEM_USETYPE_WALKIETALKIE) {
if(items[i].value == radioFrequency) { if(items[i].value == radioFrequency) {
walkieTalkieIncomingToNearbyPlayers(null, messageText, items[i].position); walkieTalkieIncomingToNearbyPlayers(null, messageText, getItemPosition(i));
} }
} }
} }
@@ -63,7 +63,7 @@ function walkieTalkieOutgoingToNearbyPlayers(client, messageText) {
// =========================================================================== // ===========================================================================
function walkieTalkieIncomingToNearbyPlayers(client, messageText, position = null) { function walkieTalkieIncomingToNearbyPlayers(client, messageText, position = null) {
let prefix = `${getInlineChatColourByName("lightGrey")}(Radio)`; let prefix = `${getInlineChatColourByName("lightGrey")}(Nearby radio)`;
if(client != null) { if(client != null) {
prefix = `${getCharacterFullName(client)} ${getInlineChatColourByName("lightGrey")}(from radio)`; prefix = `${getCharacterFullName(client)} ${getInlineChatColourByName("lightGrey")}(from radio)`;
} }