Merge branch 'master' into release

js/Input.js

@@ -199,7 +199,7 @@ Input.convert = function()
     }
     if (this.convInput.length > 1)
     {
-        if (this.convInput[1].charCodeAt(0) > '가'.charCodeAt(0)) Input.input.splice(0, this.input.length - 2);
+        if (this.convInput[1].charCodeAt(0) >= '가'.charCodeAt(0)) Input.input.splice(0, this.input.length - 2);
         else Input.input.splice(0, this.input.length - 1);
         this.converted += this.convInput.slice(0, 1);
         this.convInput = this.convInput.slice(1, 2);

server.js

@@ -89,25 +89,28 @@ io.on('connection', function(socket)
     {
         socket.playerData.currentRoom.announceToTarget(msg.target, 'attacked', msg);
         //console.log('attack ' + msg.target + ' by ' + msg.attacker.id + ' with ' + msg.text);
-        let target = GameServer.findPlayerSocket(msg.target);
-        if (target != null)
+        setTimeout(function()
         {
-            let dataToPush = 
+            let target = GameServer.findPlayerSocket(msg.target);
+            if (target != null)
             {
-                attackerId: msg.attacker.id,
-                attacker: msg.attacker.nickname,
-                word: msg.text,
-                wordGrade: msg.grade,
-                time: Date.now()
-            }
+                let dataToPush = 
+                {
+                    attackerId: msg.attacker.id,
+                    attacker: msg.attacker.nickname,
+                    word: msg.text,
+                    wordGrade: msg.grade,
+                    time: Date.now()
+                }
 
-            if (target.playerData.playingData.lastAttacks.length < 5) target.playerData.playingData.lastAttacks.push(dataToPush);
-            else
-            {
-                target.playerData.playingData.lastAttacks.splice(0, 1);
-                target.playerData.playingData.lastAttacks.push(dataToPush);
+                if (target.playerData.playingData.lastAttacks.length < 5) target.playerData.playingData.lastAttacks.push(dataToPush);
+                else
+                {
+                    target.playerData.playingData.lastAttacks.splice(0, 1);
+                    target.playerData.playingData.lastAttacks.push(dataToPush);
+                }
             }
-        }
+        }, 4000);
     });
 
     socket.on('defeated', function()