From 177424b220a3e0af9da2ac842c438a1145d7abb6 Mon Sep 17 00:00:00 2001
From: SpacialCircumstances <SpacialCircumstances@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:45:27 +0100
Subject: [PATCH 1/3] Make delete/pause/force start buttons work again

---
 client/src/views/game/Detail.vue            |  91 ----------
 client/src/views/game/GameControl.vue       | 181 +++++++++++++++-----
 client/src/views/game/GamePlayerControl.vue |  74 ++++----
 3 files changed, 176 insertions(+), 170 deletions(-)

diff --git a/client/src/views/game/Detail.vue b/client/src/views/game/Detail.vue
index 064bb1f8f..eccf08ebc 100644
--- a/client/src/views/game/Detail.vue
+++ b/client/src/views/game/Detail.vue
@@ -92,97 +92,6 @@ export default {
 
       this.isLoading = false
     },
-    async pauseGame () {
-      if (await this.$confirm('Pause game', 'Are you sure you want to pause this game?')) {
-        this.isLoading = true
-
-        try {
-          await gameService.pause(this.game._id)
-
-          this.$toast.success(`The game has been paused. Please notify the players.`)
-
-          await this.loadGame()
-        } catch (err) {
-          this.errors = err.response.data.errors;
-          console.error(err)
-        }
-
-        this.isLoading = false
-      }
-    },
-    async fastForwardGame () {
-      if (await this.$confirm('Fast forward game', 'Are you sure you want to fast forward this game?')) {
-        this.isLoading = true
-
-        try {
-          await gameService.fastForward(this.game._id)
-
-          this.$toast.success(`The game has been fast forwarded. Please notify the players.`)
-
-          await this.loadGame()
-        } catch (err) {
-          this.errors = err.response.data.errors;
-          console.error(err)
-        }
-
-        this.isLoading = false
-      }
-    },
-    async forceStartGame () {
-      if (await this.$confirm('Force start game', 'All open slots will be filled with bots. Are you sure you want to force start this game?')) {
-        this.isLoading = true
-
-        try {
-          await gameService.forceStart(this.game._id)
-
-          this.$toast.success(`The game has been force started. Please notify the players.`)
-
-          await this.loadGame()
-        } catch (err) {
-          this.errors = err.response.data.errors;
-          console.error(this.error);
-          console.error(err)
-        }
-
-        this.isLoading = false
-      }
-    },
-    async resumeGame () {
-      if (await this.$confirm('Resume game', 'Are you sure you want to resume this game?')) {
-        this.isLoading = true
-
-        try {
-          await gameService.resume(this.game._id)
-
-          this.$toast.success(`The game has been resumed. Please notify the players.`)
-
-          await this.loadGame()
-        } catch (err) {
-          this.errors = err.response.data.errors;
-          console.error(err)
-        }
-
-        this.isLoading = false
-      }
-    },
-    async deleteGame () {
-      if (await this.$confirm('Delete game', 'Are you sure you want to delete this game?')) {
-        this.isLoading = true
-
-        try {
-          let response = await gameService.delete(this.game._id)
-
-          if (response.status === 200) {
-            router.push({name: 'main-menu'})
-          }
-        } catch (err) {
-          this.errors = err.response.data.errors;
-          console.error(err)
-        }
-
-        this.isLoading = false
-      }
-    }
   },
   computed: {
     isNewPlayerGame () {
diff --git a/client/src/views/game/GameControl.vue b/client/src/views/game/GameControl.vue
index 0ceb9d06f..ed78f0501 100644
--- a/client/src/views/game/GameControl.vue
+++ b/client/src/views/game/GameControl.vue
@@ -1,61 +1,158 @@
 <template>
-    <div class="row mb-1 bg-dark pt-2 pb-2" v-if="game.settings.general.isGameAdmin">
-        <div class="col">
-            <button class="btn btn-danger" v-if="!game.state.startDate"
-                @click="deleteGame">Delete Game</button>
-            <button class="btn btn-warning" v-if="canModifyPauseState() && !game.state.paused" @click="pauseGame">Pause
-                Game</button>
-            <button class="btn btn-warning" v-if="canModifyPauseState() && game.state.paused" @click="resumeGame">Resume
-                Game</button>
-            <button class="btn btn-danger ms-1" v-if="!game.state.startDate"
-                @click="forceStartGame">Force start Game</button>
-            <button class="btn btn-warning ms-1"
-                v-if="game.state.startDate && !game.state.endDate && !game.state.forceTick"
-                @click="fastForwardGame">Fast Forward Game</button>
-
-            <view-collapse-panel @onToggle="togglePlayerControl" title="Player Control">
-                <game-player-control :game="fullGame" @onGameModified="loadFullGame" />
-            </view-collapse-panel>
-        </div>
+  <div class="row mb-1 bg-dark pt-2 pb-2" v-if="game.settings.general.isGameAdmin">
+    <div class="col">
+      <button class="btn btn-danger" v-if="!game.state.startDate"
+              @click="deleteGame">Delete Game
+      </button>
+      <button class="btn btn-warning" v-if="canModifyPauseState() && !game.state.paused" @click="pauseGame">Pause
+        Game
+      </button>
+      <button class="btn btn-warning" v-if="canModifyPauseState() && game.state.paused" @click="resumeGame">Resume
+        Game
+      </button>
+      <button class="btn btn-danger ms-1" v-if="!game.state.startDate"
+              @click="forceStartGame">Force start Game
+      </button>
+      <button class="btn btn-warning ms-1"
+              v-if="game.state.startDate && !game.state.endDate && !game.state.forceTick"
+              @click="fastForwardGame">Fast Forward Game
+      </button>
+
+      <view-collapse-panel @onToggle="togglePlayerControl" title="Player Control">
+        <game-player-control :game="fullGame" @onGameModified="loadFullGame"/>
+      </view-collapse-panel>
     </div>
+  </div>
 </template>
 <script>
 import GameHelper from '../../services/gameHelper'
 import ViewCollapsePanel from '../components/ViewCollapsePanel.vue'
 import GamePlayerControl from './GamePlayerControl.vue';
 import gameService from '../../services/api/game'
+import router from "../../router.js";
 
 export default {
-    components: {
-        'view-collapse-panel': ViewCollapsePanel,
-        'game-player-control': GamePlayerControl,
+  components: {
+    'view-collapse-panel': ViewCollapsePanel,
+    'game-player-control': GamePlayerControl,
+  },
+  props: {
+    game: Object,
+  },
+  data() {
+    return {
+      fullGame: null,
+    }
+  },
+  methods: {
+    canModifyPauseState() {
+      return this.game.settings.general.isGameAdmin
+        && GameHelper.isGameStarted(this.game)
+        && !GameHelper.isGamePendingStart(this.game)
+        && !GameHelper.isGameFinished(this.game);
     },
-    props: {
-        game: Object,
+    async togglePlayerControl(collapsed) {
+      if (!collapsed && !this.fullGame) {
+        await this.loadFullGame();
+      }
+    },
+    async loadFullGame() {
+      const resp = await gameService.getGameGalaxy(this.game._id);
+
+      this.fullGame = resp.data;
     },
-    data () {
-        return {
-            fullGame: null,
+    async pauseGame() {
+      if (await this.$confirm('Pause game', 'Are you sure you want to pause this game?')) {
+        this.isLoading = true
+
+        try {
+          await gameService.pause(this.game._id)
+
+          this.$toast.success(`The game has been paused. Please notify the players.`)
+
+          await this.loadGame()
+        } catch (err) {
+          this.errors = err.response.data.errors;
+          console.error(err)
         }
+
+        this.isLoading = false
+      }
     },
-    methods: {
-        canModifyPauseState() {
-            return this.game.settings.general.isGameAdmin
-                && GameHelper.isGameStarted(this.game)
-                && !GameHelper.isGamePendingStart(this.game)
-                && !GameHelper.isGameFinished(this.game);
-        },
-        async togglePlayerControl (collapsed) {
-            if (!collapsed && !this.fullGame) {
-                await this.loadFullGame();
-            }
-        },
-        async loadFullGame () {
-            const resp = await gameService.getGameGalaxy(this.game._id);
-
-            this.fullGame = resp.data;
+    async fastForwardGame() {
+      if (await this.$confirm('Fast forward game', 'Are you sure you want to fast forward this game?')) {
+        this.isLoading = true
+
+        try {
+          await gameService.fastForward(this.game._id)
+
+          this.$toast.success(`The game has been fast forwarded. Please notify the players.`)
+
+          await this.loadGame()
+        } catch (err) {
+          this.errors = err.response.data.errors;
+          console.error(err)
         }
+
+        this.isLoading = false
+      }
+    },
+    async forceStartGame() {
+      if (await this.$confirm('Force start game', 'All open slots will be filled with bots. Are you sure you want to force start this game?')) {
+        this.isLoading = true
+
+        try {
+          await gameService.forceStart(this.game._id)
+
+          this.$toast.success(`The game has been force started. Please notify the players.`)
+
+          await this.loadGame()
+        } catch (err) {
+          this.errors = err.response.data.errors;
+          console.error(this.error);
+          console.error(err)
+        }
+
+        this.isLoading = false
+      }
+    },
+    async resumeGame() {
+      if (await this.$confirm('Resume game', 'Are you sure you want to resume this game?')) {
+        this.isLoading = true
+
+        try {
+          await gameService.resume(this.game._id)
+
+          this.$toast.success(`The game has been resumed. Please notify the players.`)
+
+          await this.loadGame()
+        } catch (err) {
+          this.errors = err.response.data.errors;
+          console.error(err)
+        }
+
+        this.isLoading = false
+      }
+    },
+    async deleteGame() {
+      if (await this.$confirm('Delete game', 'Are you sure you want to delete this game?')) {
+        this.isLoading = true
+
+        try {
+          let response = await gameService.delete(this.game._id)
+
+          if (response.status === 200) {
+            router.push({name: 'main-menu'})
+          }
+        } catch (err) {
+          this.errors = err.response.data.errors;
+          console.error(err)
+        }
+
+        this.isLoading = false
+      }
     }
+  }
 }
 </script>
 <style scoped></style>
diff --git a/client/src/views/game/GamePlayerControl.vue b/client/src/views/game/GamePlayerControl.vue
index 150402529..55a860fc5 100644
--- a/client/src/views/game/GamePlayerControl.vue
+++ b/client/src/views/game/GamePlayerControl.vue
@@ -1,51 +1,51 @@
 <template>
-    <loading-spinner :loading="!game"/>
+  <loading-spinner :loading="!game"/>
 
-    <div v-if="game">
-        <table class="table table-striped table-hover">
-            <tbody>
-                <tr v-for="player of filledSlots">
-                    <td>{{ player.alias }}</td>
-                    <td>
-                        <button class="btn btn-warning" @click="kickPlayer(player)"><i class="fas fa-hammer"></i> Kick</button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
+  <div v-if="game">
+    <table class="table table-striped table-hover">
+      <tbody>
+      <tr v-for="player of filledSlots">
+        <td>{{ player.alias }}</td>
+        <td>
+          <button class="btn btn-warning" @click="kickPlayer(player)"><i class="fas fa-hammer"></i> Kick</button>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
 </template>
 <script>
 import LoadingSpinner from '../components/LoadingSpinner.vue'
 import gameService from '../../services/api/game'
 
 export default {
-    components: {
-        'loading-spinner': LoadingSpinner,
-    },
-    props: {
-        game: Object,
-    },
-    methods: {
-        async kickPlayer (player) {
-            if (await this.$confirm(`Kick Player`, `Do you really want to kick player ${player.alias}?`)) {
-                try {
-                    await gameService.kickPlayer(this.game._id, player._id);
+  components: {
+    'loading-spinner': LoadingSpinner,
+  },
+  props: {
+    game: Object,
+  },
+  methods: {
+    async kickPlayer(player) {
+      if (await this.$confirm(`Kick Player`, `Do you really want to kick player ${player.alias}?`)) {
+        try {
+          await gameService.kickPlayer(this.game._id, player._id);
 
-                    this.$toast.info('Player kicked');
-                } catch (e) {
-                    this.$toast.error(e?.response?.data?.errors?.join(", "));
-                }
-
-                this.$emit('onGameModified')
-            }
-        }
-    },
-    computed: {
-        filledSlots () {
-            return this.game.galaxy.players.filter(p => !p.isOpenSlot);
+          this.$toast.info('Player kicked');
+        } catch (e) {
+          this.$toast.error(e?.response?.data?.errors?.join(", "));
         }
+
+        this.$emit('onGameModified')
+      }
+    }
+  },
+  computed: {
+    filledSlots() {
+      return this.game.galaxy.players.filter(p => !p.isOpenSlot);
     }
+  }
 }
 </script>
 <style scoped>
-</style>
\ No newline at end of file
+</style>

From 9fe1198f302fafee56044d280f2a81990b8d92d4 Mon Sep 17 00:00:00 2001
From: SpacialCircumstances <SpacialCircumstances@users.noreply.github.com>
Date: Fri, 22 Nov 2024 22:07:30 +0100
Subject: [PATCH 2/3] Fix endless loop on logout

---
 client/src/store.js                           | 3 ++-
 client/src/views/Announcements.vue            | 2 +-
 client/src/views/MainMenu.vue                 | 2 +-
 client/src/views/account/Settings.vue         | 2 +-
 client/src/views/admin/AdministrationPage.vue | 2 +-
 client/src/views/components/ViewContainer.vue | 3 ++-
 client/src/views/game/ActiveGames.vue         | 2 +-
 client/src/views/game/Create.vue              | 2 +-
 client/src/views/game/Detail.vue              | 2 +-
 client/src/views/game/Leaderboard.vue         | 2 +-
 client/src/views/game/List.vue                | 2 +-
 client/src/views/guild/Create.vue             | 2 +-
 client/src/views/guild/Detail.vue             | 2 +-
 client/src/views/guild/MyGuild.vue            | 2 +-
 client/src/views/guild/Rename.vue             | 2 +-
 client/src/views/shop/Avatars.vue             | 2 +-
 client/src/views/shop/GalacticCredits.vue     | 2 +-
 client/src/views/shop/PurchaseComplete.vue    | 2 +-
 client/src/views/shop/PurchaseFailed.vue      | 2 +-
 19 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/client/src/store.js b/client/src/store.js
index 6edf71c26..03c1adb0e 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -536,10 +536,11 @@ export default createStore({
             commit('setUsername', response.data.username)
             commit('setRoles', response.data.roles)
             commit('setUserCredits', response.data.credits)
+            return true;
           }
         }
 
-        return true;
+        return false;
       } catch (err) {
         console.error(err);
         return false;
diff --git a/client/src/views/Announcements.vue b/client/src/views/Announcements.vue
index f3ce129c8..1a60665dd 100644
--- a/client/src/views/Announcements.vue
+++ b/client/src/views/Announcements.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container :hideTopBar="true">
+  <view-container :hideTopBar="true" :is-auth-page="true">
     <view-title
       title="Announcements"
       :showSocialLinks="true"
diff --git a/client/src/views/MainMenu.vue b/client/src/views/MainMenu.vue
index 27ce6b5f3..c07f9a5c9 100644
--- a/client/src/views/MainMenu.vue
+++ b/client/src/views/MainMenu.vue
@@ -7,7 +7,7 @@ import home5 from '../assets/screenshots/home-5.png'
 </script>
 
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Main Menu" :hideHomeButton="true" :showSocialLinks="true"/>
 
     <warnings v-if="user" :warnings="user.warnings" />
diff --git a/client/src/views/account/Settings.vue b/client/src/views/account/Settings.vue
index 64f00e352..f1b0d2837 100644
--- a/client/src/views/account/Settings.vue
+++ b/client/src/views/account/Settings.vue
@@ -1,6 +1,6 @@
 <template>
   <view-container>
-    <view-title title="Account" />
+    <view-title title="Account" :is-auth-page="true" />
 
     <loading-spinner :loading="!info"/>
 
diff --git a/client/src/views/admin/AdministrationPage.vue b/client/src/views/admin/AdministrationPage.vue
index a29f1f2f9..4dbd19624 100644
--- a/client/src/views/admin/AdministrationPage.vue
+++ b/client/src/views/admin/AdministrationPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title :title="title" />
 
     <nav>
diff --git a/client/src/views/components/ViewContainer.vue b/client/src/views/components/ViewContainer.vue
index 9cda6382b..d90969877 100644
--- a/client/src/views/components/ViewContainer.vue
+++ b/client/src/views/components/ViewContainer.vue
@@ -44,6 +44,7 @@ import ViewContainerTopBarVue from './ViewContainerTopBar.vue'
 
 export default {
   props: {
+    isAuthPage: Boolean,
     hideTopBar: Boolean
   },
   components: {
@@ -51,7 +52,7 @@ export default {
     'view-container-top-bar': ViewContainerTopBarVue
   },
   async mounted() {
-    if (!this.$store.state.userId) {
+    if (this.isAuthPage && !this.$store.state.userId) {
       await this.$store.dispatch('verify')
     }
   }
diff --git a/client/src/views/game/ActiveGames.vue b/client/src/views/game/ActiveGames.vue
index abcc3a1d2..3c93f6cbd 100644
--- a/client/src/views/game/ActiveGames.vue
+++ b/client/src/views/game/ActiveGames.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="My Games" />
 
     <active-games/>
diff --git a/client/src/views/game/Create.vue b/client/src/views/game/Create.vue
index 2a4290ccb..c5d376ca2 100644
--- a/client/src/views/game/Create.vue
+++ b/client/src/views/game/Create.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Create Game" />
     <loading-spinner :loading="!settings || isCreatingGame"/>
 
diff --git a/client/src/views/game/Detail.vue b/client/src/views/game/Detail.vue
index eccf08ebc..8edf0ff22 100644
--- a/client/src/views/game/Detail.vue
+++ b/client/src/views/game/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Game Settings" navigation="main-menu"/>
 
     <loading-spinner :loading="isLoading"/>
diff --git a/client/src/views/game/Leaderboard.vue b/client/src/views/game/Leaderboard.vue
index 05f2ece02..1cf98b00b 100644
--- a/client/src/views/game/Leaderboard.vue
+++ b/client/src/views/game/Leaderboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Leaderboards" />
 
     <ul class="nav nav-tabs">
diff --git a/client/src/views/game/List.vue b/client/src/views/game/List.vue
index 5a781ee92..351c8a199 100644
--- a/client/src/views/game/List.vue
+++ b/client/src/views/game/List.vue
@@ -10,7 +10,7 @@ import relaxed16Img from '../../assets/screenshots/16_player_relaxed.png';
 </script>
 
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Join Game" />
 
     <community-guidelines-bar />
diff --git a/client/src/views/guild/Create.vue b/client/src/views/guild/Create.vue
index 460dd5933..abe53af9a 100644
--- a/client/src/views/guild/Create.vue
+++ b/client/src/views/guild/Create.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Create Guild" />
 
     <loading-spinner :loading="isLoading"/>
diff --git a/client/src/views/guild/Detail.vue b/client/src/views/guild/Detail.vue
index 8ef51face..7877a4c87 100644
--- a/client/src/views/guild/Detail.vue
+++ b/client/src/views/guild/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title :title="guild ? guildFullName : 'Guild'" />
 
     <loading-spinner :loading="isLoading"/>
diff --git a/client/src/views/guild/MyGuild.vue b/client/src/views/guild/MyGuild.vue
index e89319e6d..5b4b133b6 100644
--- a/client/src/views/guild/MyGuild.vue
+++ b/client/src/views/guild/MyGuild.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title :title="guild ? guildFullName : 'Guilds'" />
 
     <loading-spinner :loading="isLoading"/>
diff --git a/client/src/views/guild/Rename.vue b/client/src/views/guild/Rename.vue
index 738ca1537..deb70e426 100644
--- a/client/src/views/guild/Rename.vue
+++ b/client/src/views/guild/Rename.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Rename Guild" />
 
     <loading-spinner :loading="isLoading"/>
diff --git a/client/src/views/shop/Avatars.vue b/client/src/views/shop/Avatars.vue
index 107e956e9..059b17d00 100644
--- a/client/src/views/shop/Avatars.vue
+++ b/client/src/views/shop/Avatars.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Avatar Shop" />
 
     <p>Unlock new races to play with <strong class="text-warning">Galactic Credits</strong>. <router-link :to="{ name: 'galactic-credits-shop'}"><i class="fas fa-shopping-basket"></i> Purchase Galactic Credits</router-link> or earn credits by winning official games.</p>
diff --git a/client/src/views/shop/GalacticCredits.vue b/client/src/views/shop/GalacticCredits.vue
index 5d5a6b363..257455c87 100644
--- a/client/src/views/shop/GalacticCredits.vue
+++ b/client/src/views/shop/GalacticCredits.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Galactic Credit Packs" />
 
     <p>
diff --git a/client/src/views/shop/PurchaseComplete.vue b/client/src/views/shop/PurchaseComplete.vue
index 8d0943033..112234d3b 100644
--- a/client/src/views/shop/PurchaseComplete.vue
+++ b/client/src/views/shop/PurchaseComplete.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Purchase Complete" />
 
     <p>Thank you for your purchase, it goes a long way to help support continued development of <strong>Solaris</strong>.</p>
diff --git a/client/src/views/shop/PurchaseFailed.vue b/client/src/views/shop/PurchaseFailed.vue
index e516922c8..7b315fda9 100644
--- a/client/src/views/shop/PurchaseFailed.vue
+++ b/client/src/views/shop/PurchaseFailed.vue
@@ -1,5 +1,5 @@
 <template>
-  <view-container>
+  <view-container :is-auth-page="true">
     <view-title title="Purchase Failed" />
 
     <p>There was an problem processing your payment, please contact a developer for support. You may have been charged, please do not try the transaction again.</p>

From 486087d7630e152a4a585117e30390447002d4a7 Mon Sep 17 00:00:00 2001
From: SpacialCircumstances <SpacialCircumstances@users.noreply.github.com>
Date: Fri, 22 Nov 2024 23:00:36 +0100
Subject: [PATCH 3/3] Improve displaying of RTQ player count

---
 client/src/views/game/components/leaderboard/Leaderboard.vue | 2 +-
 server/services/gameGalaxy.ts                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/views/game/components/leaderboard/Leaderboard.vue b/client/src/views/game/components/leaderboard/Leaderboard.vue
index 77e48ec28..86e84547d 100644
--- a/client/src/views/game/components/leaderboard/Leaderboard.vue
+++ b/client/src/views/game/components/leaderboard/Leaderboard.vue
@@ -59,7 +59,7 @@
 
     <div class="row" v-if="game.state.readyToQuitCount">
       <div class="col text-center pt-2">
-        <p>{{game.state.readyToQuitCount}} of {{game.settings.general.playerLimit}} players are ready to quit.</p>
+        <p>{{game.state.readyToQuitCount}} of {{game.state.players}} active players are ready to quit.</p>
       </div>
     </div>
 
diff --git a/server/services/gameGalaxy.ts b/server/services/gameGalaxy.ts
index e0abb9a2d..1353e2062 100644
--- a/server/services/gameGalaxy.ts
+++ b/server/services/gameGalaxy.ts
@@ -319,7 +319,7 @@ export default class GameGalaxyService {
             return;
         }
 
-        game.state.readyToQuitCount = game.galaxy.players.filter(this.gameService.isReadyToQuitOrDefeated).length;
+        game.state.readyToQuitCount = game.galaxy.players.filter((p) => !p.defeated && p.readyToQuit).length;
     }
 
     _setStarInfoBasic(doc: Game) {