From 185ef7fd2b9611e5e8b1edd74702973a4c305328 Mon Sep 17 00:00:00 2001 From: Ethan Stubbs <37120476+tgpethan@users.noreply.github.com> Date: Sat, 6 Feb 2021 01:27:43 +0000 Subject: [PATCH] Change the stream that tourney match chat joining uses --- server/Packets/TourneyJoinMatchChannel.js | 8 ++++---- server/Packets/TourneyLeaveMatchChannel.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/Packets/TourneyJoinMatchChannel.js b/server/Packets/TourneyJoinMatchChannel.js index b50749c..8f7e9bc 100644 --- a/server/Packets/TourneyJoinMatchChannel.js +++ b/server/Packets/TourneyJoinMatchChannel.js @@ -12,14 +12,14 @@ module.exports = function(CurrentUser, MatchID) { } } - if (global.StreamsHandler.isUserInStream(match.matchStreamName, CurrentUser.uuid)) - return global.consoleHelper.printBancho(`Did not add user to channel ${match.matchStreamName} because they are already in it`); + if (global.StreamsHandler.isUserInStream(match.matchChatStreamName, CurrentUser.uuid)) + return global.consoleHelper.printBancho(`Did not add user to channel ${match.matchChatStreamName} because they are already in it`); const osuPacketWriter = new osu.Bancho.Writer; osuPacketWriter.ChannelJoinSuccess("#multiplayer"); - if (!global.StreamsHandler.isUserInStream(match.matchStreamName, CurrentUser.uuid)) - global.StreamsHandler.addUserToStream(match.matchStreamName, CurrentUser.uuid); + if (!global.StreamsHandler.isUserInStream(match.matchChatStreamName, CurrentUser.uuid)) + global.StreamsHandler.addUserToStream(match.matchChatStreamName, CurrentUser.uuid); CurrentUser.addActionToQueue(osuPacketWriter.toBuffer); } diff --git a/server/Packets/TourneyLeaveMatchChannel.js b/server/Packets/TourneyLeaveMatchChannel.js index f1f3fd1..6a409b5 100644 --- a/server/Packets/TourneyLeaveMatchChannel.js +++ b/server/Packets/TourneyLeaveMatchChannel.js @@ -8,14 +8,14 @@ module.exports = function(CurrentUser, MatchID) { match.isTourneyMatch = false; match.tourneyClientUsers = []; - if (global.StreamsHandler.isUserInStream(match.matchStreamName, CurrentUser.uuid)) - return global.consoleHelper.printBancho(`Did not add user to channel ${match.matchStreamName} because they are already in it`); + if (global.StreamsHandler.isUserInStream(match.matchChatStreamName, CurrentUser.uuid)) + return global.consoleHelper.printBancho(`Did not add user to channel ${match.matchChatStreamName} because they are already in it`); const osuPacketWriter = new osu.Bancho.Writer; osuPacketWriter.ChannelRevoked("#multiplayer"); - if (!global.StreamsHandler.isUserInStream(match.matchStreamName, CurrentUser.uuid)) - global.StreamsHandler.removeUserFromStream(match.matchStreamName, CurrentUser.uuid); + if (!global.StreamsHandler.isUserInStream(match.matchChatStreamName, CurrentUser.uuid)) + global.StreamsHandler.removeUserFromStream(match.matchChatStreamName, CurrentUser.uuid); CurrentUser.addActionToQueue(osuPacketWriter.toBuffer); } else {