Commit 8a83a09f authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 4a08dec8 414206d6
...@@ -1951,7 +1951,7 @@ ygopro.ctos_follow 'PLAYER_INFO', true, (buffer, info, client, server, datas)-> ...@@ -1951,7 +1951,7 @@ ygopro.ctos_follow 'PLAYER_INFO', true, (buffer, info, client, server, datas)->
return false return false
, name)) , name))
client.rag = true client.rag = true
if settings.modules.mycard.enabled and settings.modules.mycard.ban_get if settings.modules.mycard.enabled and settings.modules.mycard.ban_get and !client.is_local
try try
banMCRequest = await axios.get settings.modules.mycard.ban_get, banMCRequest = await axios.get settings.modules.mycard.ban_get,
paramsSerializer: qs.stringify paramsSerializer: qs.stringify
...@@ -1989,7 +1989,7 @@ ygopro.ctos_follow 'PLAYER_INFO', true, (buffer, info, client, server, datas)-> ...@@ -1989,7 +1989,7 @@ ygopro.ctos_follow 'PLAYER_INFO', true, (buffer, info, client, server, datas)->
client.lang=settings.modules.i18n.fallback client.lang=settings.modules.i18n.fallback
await return false await return false
ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)-> ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
#log.info info #log.info info
info.pass=info.pass.trim() info.pass=info.pass.trim()
client.pass = info.pass client.pass = info.pass
......
...@@ -2640,7 +2640,7 @@ ...@@ -2640,7 +2640,7 @@
}, name)) { }, name)) {
client.rag = true; client.rag = true;
} }
if (settings.modules.mycard.enabled && settings.modules.mycard.ban_get) { if (settings.modules.mycard.enabled && settings.modules.mycard.ban_get && !client.is_local) {
try { try {
banMCRequest = (await axios.get(settings.modules.mycard.ban_get, { banMCRequest = (await axios.get(settings.modules.mycard.ban_get, {
paramsSerializer: qs.stringify, paramsSerializer: qs.stringify,
...@@ -2688,7 +2688,7 @@ ...@@ -2688,7 +2688,7 @@
return false; return false;
}); });
ygopro.ctos_follow('JOIN_GAME', false, async function(buffer, info, client, server, datas) { ygopro.ctos_follow('JOIN_GAME', true, async function(buffer, info, client, server, datas) {
var available_logs, check_buffer_indentity, create_room_with_action, len3, len4, len5, len6, line, n, name, o, p, pre_room, q, recover_match, ref4, ref5, ref6, ref7, replay_id, room; var available_logs, check_buffer_indentity, create_room_with_action, len3, len4, len5, len6, line, n, name, o, p, pre_room, q, recover_match, ref4, ref5, ref6, ref7, replay_id, room;
//log.info info //log.info info
info.pass = info.pass.trim(); info.pass = info.pass.trim();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment