Merge branch 'mc'

ygopro-server.coffee

@@ -1690,7 +1690,7 @@ class Room
         else
           for player in @players when player.pos != 7
             @scores[player.name_vpass] = -5
-          if @players.length == 2 and !client.arena_quit_free
+          if @players.length == 2 and @arena == 'athletic' and !client.arena_quit_free
             @scores[client.name_vpass] = -9
         @arena_score_handled = true
       index = _.indexOf(@players, client)

ygopro-server.js

@@ -2262,7 +2262,7 @@
                 this.scores[player.name_vpass] = -5;
               }
             }
-            if (this.players.length === 2 && !client.arena_quit_free) {
+            if (this.players.length === 2 && this.arena === 'athletic' && !client.arena_quit_free) {
               this.scores[client.name_vpass] = -9;
             }
           }