Skip to content
Snippets Groups Projects

Dev

Merged Tobias Ingebrigt Ørstad requested to merge dev into master
23 files
+ 446
287
Compare changes
  • Side-by-side
  • Inline
Files
23
+ 13
0
@@ -220,6 +220,8 @@ router.post("/join", (req, res) => {
@@ -220,6 +220,8 @@ router.post("/join", (req, res) => {
active: true,
active: true,
// the array of players cannot already contain the player
// the array of players cannot already contain the player
players: { $nin: [playerId] },
players: { $nin: [playerId] },
 
// we dont want tournaments that have gone past their starttime
 
startTime: { $gte: new Date() },
},
},
// Add the player to the array
// Add the player to the array
{
{
@@ -500,6 +502,17 @@ function roundcheck(client, tournament) {
@@ -500,6 +502,17 @@ function roundcheck(client, tournament) {
//if there are less then two people left in the first round, or zero people left in the first round
//if there are less then two people left in the first round, or zero people left in the first round
//the tournament ends
//the tournament ends
}
}
 
if (rounds.length > 0) {
 
// If there is only one player in the tournaments first round and the starttime
 
// has expired, we end the tournament
 
if (
 
left.length < 2 &&
 
active == 1 &&
 
new Date(start) < new Date()
 
) {
 
end = true;
 
}
 
}
functions
functions
.timeOut(client, tournament, timedOut, timedOutRounds)
.timeOut(client, tournament, timedOut, timedOutRounds)
.then(
.then(
Loading