Merge branch 'mc'

ygopro-server.coffee

@@ -2858,6 +2858,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
     pos = 1 - pos unless client.is_first
     pos = pos * 2 if pos >= 0 and room.hostinfo.mode == 2
     val = buffer.readInt32LE(2)
+    if room.dueling_players[pos]
       room.dueling_players[pos].lp -= val
       room.dueling_players[pos].lp = 0 if room.dueling_players[pos].lp < 0
       if 0 < room.dueling_players[pos].lp <= 100
@@ -2868,6 +2869,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
     pos = 1 - pos unless client.is_first
     pos = pos * 2 if pos >= 0 and room.hostinfo.mode == 2
     val = buffer.readInt32LE(2)
+    if room.dueling_players[pos]
       room.dueling_players[pos].lp += val
 
   if msg_name == 'LPUPDATE' and client.pos == 0
@@ -2875,6 +2877,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
     pos = 1 - pos unless client.is_first
     pos = pos * 2 if pos >= 0 and room.hostinfo.mode == 2
     val = buffer.readInt32LE(2)
+    if room.dueling_players[pos]
       room.dueling_players[pos].lp = val
 
   if msg_name == 'PAY_LPCOST' and client.pos == 0
@@ -2882,6 +2885,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
     pos = 1 - pos unless client.is_first
     pos = pos * 2 if pos >= 0 and room.hostinfo.mode == 2
     val = buffer.readInt32LE(2)
+    if room.dueling_players[pos]
       room.dueling_players[pos].lp -= val
       room.dueling_players[pos].lp = 0 if room.dueling_players[pos].lp < 0
       if 0 < room.dueling_players[pos].lp <= 100

ygopro-server.js

@@ -3745,6 +3745,7 @@
         pos = pos * 2;
       }
       val = buffer.readInt32LE(2);
+      if (room.dueling_players[pos]) {
         room.dueling_players[pos].lp -= val;
         if (room.dueling_players[pos].lp < 0) {
           room.dueling_players[pos].lp = 0;
@@ -3753,6 +3754,7 @@
           ygopro.stoc_send_chat_to_room(room, "${lp_low_opponent}", ygopro.constants.COLORS.PINK);
         }
       }
+    }
     if (msg_name === 'RECOVER' && client.pos === 0) {
       pos = buffer.readUInt8(1);
       if (!client.is_first) {
@@ -3762,8 +3764,10 @@
         pos = pos * 2;
       }
       val = buffer.readInt32LE(2);
+      if (room.dueling_players[pos]) {
         room.dueling_players[pos].lp += val;
       }
+    }
     if (msg_name === 'LPUPDATE' && client.pos === 0) {
       pos = buffer.readUInt8(1);
       if (!client.is_first) {
@@ -3773,8 +3777,10 @@
         pos = pos * 2;
       }
       val = buffer.readInt32LE(2);
+      if (room.dueling_players[pos]) {
         room.dueling_players[pos].lp = val;
       }
+    }
     if (msg_name === 'PAY_LPCOST' && client.pos === 0) {
       pos = buffer.readUInt8(1);
       if (!client.is_first) {
@@ -3784,6 +3790,7 @@
         pos = pos * 2;
       }
       val = buffer.readInt32LE(2);
+      if (room.dueling_players[pos]) {
         room.dueling_players[pos].lp -= val;
         if (room.dueling_players[pos].lp < 0) {
           room.dueling_players[pos].lp = 0;
@@ -3792,6 +3799,7 @@
           ygopro.stoc_send_chat_to_room(room, "${lp_low_self}", ygopro.constants.COLORS.PINK);
         }
       }
+    }
     //track card count
     //todo: track card count in tag mode
     if (msg_name === 'MOVE' && room.hostinfo.mode !== 2) {