Merge branch 'mc'

ygopro-server.coffee

@@ -1505,10 +1505,10 @@ class Room
       client.server.destroy()
     else
       #log.info(client.name, @started, @disconnector, @random_type, @players.length)
-      if @arena and !@started and @disconnector != 'server' and !@arena_score_handled and !client.arena_quit_free
+      if @arena and !@started and @disconnector != 'server' and !@arena_score_handled
         for player in @players when player.pos != 7
           @scores[player.name_vpass] = 0
-        if @players.length == 2
+        if @players.length == 2 and !client.arena_quit_free
           @scores[client.name_vpass] = -9
         @arena_score_handled = true
       index = _.indexOf(@players, client)

ygopro-server.js

@@ -1961,7 +1961,7 @@
         }
         client.server.destroy();
       } else {
-        if (this.arena && !this.started && this.disconnector !== 'server' && !this.arena_score_handled && !client.arena_quit_free) {
+        if (this.arena && !this.started && this.disconnector !== 'server' && !this.arena_score_handled) {
           ref3 = this.players;
           for (m = 0, len3 = ref3.length; m < len3; m++) {
             player = ref3[m];
@@ -1969,7 +1969,7 @@
               this.scores[player.name_vpass] = 0;
             }
           }
-          if (this.players.length === 2) {
+          if (this.players.length === 2 && !client.arena_quit_free) {
             this.scores[client.name_vpass] = -9;
           }
           this.arena_score_handled = true;