Merge branch 'mc'

ygopro-server.coffee

@@ -412,6 +412,8 @@ if settings.modules.challonge.enabled
   refresh_challonge_cache = () ->
     challonge_cache[0] = null
     challonge_cache[1] = null
+    return
+  refresh_challonge_cache()
   challonge.participants._index({
     id: settings.modules.challonge.tournament_id,
     callback: (() ->
@@ -424,8 +426,6 @@ if settings.modules.challonge.enabled
       return
     )
   })
-    return
-  refresh_challonge_cache()
   setInterval(refresh_challonge_cache, 30000)
 
 if settings.modules.vip.enabled

ygopro-server.js

@@ -508,6 +508,8 @@
     refresh_challonge_cache = function() {
       challonge_cache[0] = null;
       challonge_cache[1] = null;
+    };
+    refresh_challonge_cache();
     challonge.participants._index({
       id: settings.modules.challonge.tournament_id,
       callback: (function() {
@@ -517,8 +519,6 @@
         });
       })
     });
-    };
-    refresh_challonge_cache();
     setInterval(refresh_challonge_cache, 30000);
   }