Commit 5585f085 authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 66db2d1f 092c7cc9
......@@ -1888,7 +1888,7 @@ if settings.modules.stop
deck_name_match = global.deck_name_match = (deck_name, player_name) ->
if deck_name == player_name or deck_name == player_name + ".ydk" or deck_name == player_name + ".ydk.ydk"
return true
parsed_deck_name = deck_name.match(/^([^\+]+)[\+ \uff0b](.+?)(\.ydk){0,2}$/)
parsed_deck_name = deck_name.match(/^([^\+ \uff0b]+)[\+ \uff0b](.+?)(\.ydk){0,2}$/)
return parsed_deck_name and (player_name == parsed_deck_name[1] or player_name == parsed_deck_name[2])
# 功能模块
......
......@@ -2450,7 +2450,7 @@
if (deck_name === player_name || deck_name === player_name + ".ydk" || deck_name === player_name + ".ydk.ydk") {
return true;
}
parsed_deck_name = deck_name.match(/^([^\+]+)[\+ \uff0b](.+?)(\.ydk){0,2}$/);
parsed_deck_name = deck_name.match(/^([^\+ \uff0b]+)[\+ \uff0b](.+?)(\.ydk){0,2}$/);
return parsed_deck_name && (player_name === parsed_deck_name[1] || player_name === parsed_deck_name[2]);
};
......
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