From 6d6d4211f22b7b61f466b7095e1e1111d312dc20 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:47:30 -0600
Subject: [PATCH] Check if walkie-talkie is on before TX/RX

---
 scripts/server/item/walkie-talkie.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/server/item/walkie-talkie.js b/scripts/server/item/walkie-talkie.js
index 18374551..f9031807 100644
--- a/scripts/server/item/walkie-talkie.js
+++ b/scripts/server/item/walkie-talkie.js
@@ -11,7 +11,7 @@
 // ---------------------------------------------------------------------------
 
 function getPlayerActiveWalkieTalkieFrequency(client) {
-	let walkieTalkieSlot = getPlayerFirstItemSlotByUseType(client);
+	let walkieTalkieSlot = getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE);
 
 	if(walkieTalkieSlot != -1) {
 		if(getItemData(getPlayerData(client).hotBarItems[walkieTalkieSlot])) {
@@ -34,7 +34,9 @@ function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
 		if(isPlayerSpawned(clients[i])) {
 			if(!isSamePlayer(transmittingPlayer, clients[i])) {
 				if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
-					walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
+					if(getItemData(getPlayerData(client).hotBarItems[getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE)]).enabled) {
+						walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
+					}
 				}
 			}
 		}
@@ -110,6 +112,11 @@ function walkieTalkieChatCommand(command, params, client) {
 		return false;
 	}
 
+	let walkieTalkieSlot = getPlayerFirstItemSlotByUseType(client, AG_ITEM_USETYPE_WALKIETALKIE);
+	if(!getItemData(getPlayerData(client).hotBarItems[walkieTalkieSlot]).enabled) {
+		messagePlayerError(client, "Please turn on a walkie talkie first!");
+		return false;
+	}
 	walkieTalkieTransmit(getPlayerActiveWalkieTalkieFrequency(client), params, client);
 }