tgpholly/Binato
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Use an exception for match join fails

Browse source
This commit is contained in:
Ethan Stubbs 2021-02-06 01:19:22 +00:00
parent 63758f61cb
commit fcc6925a03
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
server/MultiplayerManager.js
View file

@ -130,11 +130,7 @@ module.exports = class {
osuPacketWriter.MatchJoinSuccess(matchJSON); osuPacketWriter.MatchJoinSuccess(matchJSON);
if (full) { if (full) {
// Inform the client that they can't join the match throw "MatchFullException";
osuPacketWriter = new osu.Bancho.Writer;
osuPacketWriter.MatchJoinFail();
return JoiningUser.addActionToQueue(osuPacketWriter.toBuffer);
} }
// Set the user's current match to this match // Set the user's current match to this match
@ -155,6 +151,7 @@ module.exports = class {
// A user has joined a match // A user has joined a match
this.updateMatchListing(); this.updateMatchListing();
} catch (e) { } catch (e) {
// Inform the client that there was an issue joining the match
const osuPacketWriter = new osu.Bancho.Writer; const osuPacketWriter = new osu.Bancho.Writer;
osuPacketWriter.MatchJoinFail(); osuPacketWriter.MatchJoinFail();
@ -213,25 +210,10 @@ module.exports = class {
}, 1000); }, 1000);
} }
getMatchInfoForTourneyClient(MatchID) {
let match = null;
for (let amatch in this.matches) {
if (amatch.matchId == MatchID) {
match = amatch;
}
}
if (match == null) return null;
else return match.createOsuMatchJSON();
}
getMatch(MatchID) { getMatch(MatchID) {
let match = null; for (let match in this.matches) {
for (let amatch in this.matches) { if (match.matchId == MatchID) return match;
if (amatch.matchId == MatchID) {
match = amatch;
} }
} return null;
if (match == null) return null;
else return match;
} }
} }