From de5e16a857801ec06891acf84f4888527d58c2c9 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 13 Jul 2021 00:55:53 -0500
Subject: [PATCH] Stop steaming music on spawn

---
 scripts/server/subaccount.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index 3f680d24..920bfc10 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -353,6 +353,8 @@ function selectCharacter(client, characterId = -1) {
 		onPlayerSpawn(client);
 	}, 1000);
 
+	playRadioStreamForPlayer(client, "");
+
 	getPlayerCurrentSubAccount(client).lastLogin = getCurrentUnixTimestamp();
 }
 
@@ -381,6 +383,8 @@ function switchCharacterCommand(command, params, client) {
 	logToConsole(client, `Saving ${getPlayerDisplayForConsole(client)}'s subaccount (${getCharacterFullName(client)} [${getPlayerData(client).currentSubAccount}/${getPlayerCurrentSubAccount(client).databaseId}] to database`)
 	saveSubAccountToDatabase(getPlayerCurrentSubAccount(client));
 
+	disableCityAmbienceForPlayer(client);
+
 	resetClientStuff(client);
 
 	client.despawnPlayer();
@@ -473,6 +477,10 @@ function getPlayerCurrentSubAccount(client) {
 		return false;
 	}
 
+	if(typeof getPlayerData(client).subAccounts[subAccountId] == "undefined") {
+		return false;
+	}
+
 	return getPlayerData(client).subAccounts[subAccountId];
 }