Merge branch 'server' into gameScene

GameServer.js

@@ -35,7 +35,9 @@ GameServer.enterEmptyRoom = function(playerSocket)
     let emptyRoomIndex = -1;
     for (let i = 0; i < this.playingRoom.length; i++)
     {
-        if ((this.playingRoom[i].currentPhase === this.Phase.READY || this.playingRoom[i].currentPhase === this.Phase.COUNT) && this.playingRoom[i].maxPlayer > this.playingRoom[i].currentPlayer.length)
+        if ((this.playingRoom[i].currentPhase === this.Phase.READY || this.playingRoom[i].currentPhase === this.Phase.COUNT)
+         && this.playingRoom[i].maxPlayer > this.playingRoom[i].currentPlayer.length
+         && this.playingRoom[i].checkHopae(playerSocket.playerData.nickname))
         {
             emptyRoomIndex = i;
             break;
@@ -116,6 +118,11 @@ class GameRoom
         console.log('[LOG] new room #'+this.roomId+' made, roomCount: ' + GameServer.playingRoom.length);
     }
 
+    checkHopae(newHopae)
+    {
+        return !this.currentPlayer.includes((element) => element.nickname === newHopae);
+    }
+
     enterRoom(playerSocket)
     {
         let playerInst = new Player(this, playerSocket.playerData);

server.js

@@ -48,18 +48,9 @@ io.on('connection', function(socket)
         if(msg.length < 1) socket.emit('alert' ,'errNicknameEmpty');
         else
         {
-            let isAlreadyHave = false;
-            GameServer.currentPlayer.forEach(function(element)
-            {
-                if (element.playerData.nickname === msg) isAlreadyHave = true;
-            });
-            if (isAlreadyHave) socket.emit('alert' ,'errNicknameOverlaped');
-            else
-            {
-                socket.playerData.nickname = msg;
-                console.log('['+socket.playerData.id+'] nickname set to ' + msg);
-                GameServer.enterEmptyRoom(socket);
-            }
+            socket.playerData.nickname = msg;
+            console.log('['+socket.playerData.id+'] nickname set to ' + msg);
+            GameServer.enterEmptyRoom(socket);
         }
     });