Fixed a bug where a winner was declared in the tournament, even thoug…

…h the match was a draw.
josef-stips · Oct 16, 2024 · 7d1f86c · 7d1f86c
1 parent 0823f3d
commit 7d1f86c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/script/public/App/social_stuff/tournaments.js b/src/script/public/App/social_stuff/tournaments.js
@@ -408,7 +408,7 @@ class TournamentHandler {
                                     OpenedPopUp_WhereAlertPopUpNeeded = true;
                                     AlertText.textContent = `The tournament hasn't started yet`;
                                     DisplayPopUp_PopAnimation(alertPopUp, 'flex', true);
-                                    return;
+                                    // return;
                                 };
 
                                 socket.emit('tournament_match_lobby_exists', await generateTournamentLobbyHash(), cb => {

diff --git a/src/script/public/Game/processWinner.js b/src/script/public/Game/processWinner.js
@@ -1314,6 +1314,9 @@ function PlayerWon_UpdateHisData(Player1_won, player2_won, WinCombination) {
 
 // this code block is just for tournament win case
 const tournament_win = async(player1_won, player2_won) => {
+    // in case nobody won
+    if (player1_won && player2_won) return;
+
     let tour_data = tournament_handler.clicked_tournament[1];
     let current_round_idx = findCurrentRoundByPlayerID(tour_data.current_state.rounds, localStorage.getItem('PlayerID'));
     let current_round = tour_data.current_state.rounds[current_round_idx];
@@ -1359,7 +1362,7 @@ const tournament_win = async(player1_won, player2_won) => {
 // this message recieve all clients
 socket.on('global_UltimateWin', async(player1_won, player2_won, WinCombination, player1_score, player2_score, gameSeconds) => {
     setTimeout(async() => {
-        if (!player1_score && !player2_score) {
+        if (!player1_score && !player2_score && (player1_won != player2_won)) {
             if (player1_won) {
                 player1_score = Infinity;
                 player2_score = -Infinity;