시즌 12호 머지

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,6 +89,8 @@ 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);
+        setTimeout(function()
+        {
             let target = GameServer.findPlayerSocket(msg.target);
             if (target != null)
             {
@@ -108,6 +110,7 @@ io.on('connection', function(socket)
                     target.playerData.playingData.lastAttacks.push(dataToPush);
                 }
             }
+        }, 4000);
     });
 
     socket.on('defeated', function()