Reset users ready status when a room's match ends and send the new status to everyone in the room. Fixes #32

Author: Ochii

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cso2-master-server",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "repository": "github:Ochii/cso2-master-server",
   "description": "A master server for Nexon's Counter-Strike: Online 2",
   "author": "Luís Leite",

package.json

@@ -274,7 +274,7 @@ export class ChannelManager {
         // tell other room members about the new addition
         desiredRoom.recurseUsers((u: User): void => {
             if (u !== user) {
-                desiredRoom.sendPlayerReadyStatusTo(user, u)
+                desiredRoom.sendUserReadyStatusTo(user, u)
                 desiredRoom.sendNewUserTo(u, user)
             }
         })

src/channel/channelmanager.ts

@@ -441,6 +441,25 @@ export class Room {
         return newStatus
     }
 
+    /**
+     * resets the ready status of ingame users
+     * @returns true if reset successfully, false if not
+     */
+    public resetIngameUsersReadyStatus(): boolean {
+        for (const user of this.users) {
+            const userInfo: RoomUser = this.usersInfo.get(user)
+
+            if (userInfo == null) {
+                console.warn('resetIngameUsersReadyStatus: couldnt get userinfo')
+                return false
+            }
+
+            userInfo.ready = RoomReadyStatus.No
+        }
+
+        return true
+    }
+
     /**
      * get's a room's status
      * @returns the room's status
@@ -814,24 +833,6 @@ export class Room {
         user.socket.send(reply)
     }
 
-    /**
-     * send the room's data to the user that joined the room
-     * @param user the player to send the other player's ready status
-     * @param player the player whose ready status will be sent
-     */
-    public sendPlayerReadyStatusTo(user: User, player: User): void {
-        const status: RoomReadyStatus = this.getUserReadyStatus(player)
-
-        if (status == null) {
-            console.warn('sendPlayerReadyStatusTo: couldnt get user "%s"\'s status (room "%s" room id %i)',
-                user.userName, this.settings.roomName, this.id)
-            return null
-        }
-
-        const reply: Buffer = new OutRoomPacket(user.socket).setUserReadyStatus(player, status)
-        user.socket.send(reply)
-    }
-
     /**
      * tell the user about a new user in the room
      * @param user the player to send the other player's ready status
@@ -851,7 +852,7 @@ export class Room {
     }
 
     /**
-     * tell the user about a new user in the room
+     * send an user's ready status to another user
      * @param user the player to send the other player's ready status
      * @param player the player whose ready status will be sent
      */
@@ -868,6 +869,16 @@ export class Room {
         user.socket.send(reply)
     }
 
+    /**
+     * send everyone's ready status to an user
+     * @param targetUser the user to send the info to
+     */
+    public sendRoomUsersReadyStatusTo(targetUser: User): void {
+        this.recurseUsers((u: User): void => {
+            this.sendUserReadyStatusTo(targetUser, u)
+        })
+    }
+
     /**
      * tell the user to connect to a host
      * @param user the user that will connect to the host

src/room/room.ts

@@ -118,8 +118,10 @@ export class UserManager {
             currentRoom.settings.roomName, currentRoom.id)
 
         currentRoom.setStatus(RoomStatus.Waiting)
+        currentRoom.resetIngameUsersReadyStatus()
 
         currentRoom.recurseUsers((u: User): void => {
+            currentRoom.sendRoomUsersReadyStatusTo(u)
             currentRoom.sendGameEnd(u)
         })