Merge branch 'master' into koishi

ygopro-server.coffee

@@ -1655,13 +1655,13 @@ net.createServer (client) ->
     return
 
   server.on 'close', (had_error) ->
+    server.closed = true unless server.closed
+    if !server.client
+      return
     #log.info "server closed", server.client.name, had_error
     room=ROOM_all[server.client.rid]
     #log.info "server close", server.client.ip, ROOM_connected_ip[server.client.ip]
     room.disconnector = 'server' if room
-    server.closed = true unless server.closed
-    if !server.client
-      return
     unless server.client.closed
       ygopro.stoc_send_chat(server.client, "${server_closed}", ygopro.constants.COLORS.RED)
       #if room and settings.modules.replay_delay
@@ -1671,13 +1671,13 @@ net.createServer (client) ->
     return
 
   server.on 'error', (error)->
+    server.closed = error
+    if !server.client
+      return
     #log.info "server error", client.name, error
     room=ROOM_all[server.client.rid]
     #log.info "server err close", client.ip, ROOM_connected_ip[client.ip]
     room.disconnector = 'server' if room
-    server.closed = error
-    if !server.client
-      return
     unless server.client.closed
       ygopro.stoc_send_chat(server.client, "${server_error}: #{error}", ygopro.constants.COLORS.RED)
       #if room and settings.modules.replay_delay

ygopro-server.js

@@ -2166,16 +2166,16 @@
     });
     server.on('close', function(had_error) {
       var room;
-      room = ROOM_all[server.client.rid];
-      if (room) {
-        room.disconnector = 'server';
-      }
       if (!server.closed) {
         server.closed = true;
       }
       if (!server.client) {
         return;
       }
+      room = ROOM_all[server.client.rid];
+      if (room) {
+        room.disconnector = 'server';
+      }
       if (!server.client.closed) {
         ygopro.stoc_send_chat(server.client, "${server_closed}", ygopro.constants.COLORS.RED);
         CLIENT_kick(server.client);
@@ -2184,14 +2184,14 @@
     });
     server.on('error', function(error) {
       var room;
-      room = ROOM_all[server.client.rid];
-      if (room) {
-        room.disconnector = 'server';
-      }
       server.closed = error;
       if (!server.client) {
         return;
       }
+      room = ROOM_all[server.client.rid];
+      if (room) {
+        room.disconnector = 'server';
+      }
       if (!server.client.closed) {
         ygopro.stoc_send_chat(server.client, "${server_error}: " + error, ygopro.constants.COLORS.RED);
         CLIENT_kick(server.client);