Skip to content

S
srvpro
Commit 0b93716f authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of ../srvpro

parents 1b1ece61 23c0227c
Pipeline #27245 passed with stages
        in 8 minutes and 39 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 4 additions and 4 deletions
        ygopro-server.coffee
        View file @ 0b93716f
        ...@@ -3277,7 +3277,7 @@ ygopro.ctos_follow 'SURRENDER', true, (buffer, info, client, server, datas)-> ...@@ -3277,7 +3277,7 @@ ygopro.ctos_follow 'SURRENDER', true, (buffer, info, client, server, datas)->
        ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE)
        sur_player.surrend_confirm = true sur_player.surrend_confirm = true
        for player in [client, sur_player] for player in [client, sur_player]
        ygopro.stoc_send(client, 'TEAMMATE_SURRENDER') ygopro.stoc_send(player, 'TEAMMATE_SURRENDER')
        return true return true
        await return false await return false
        ...@@ -3327,7 +3327,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)-> ...@@ -3327,7 +3327,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)->
        ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE)
        ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE)
        for player in [client, sur_player] for player in [client, sur_player]
        ygopro.stoc_send(client, 'TEAMMATE_SURRENDER') ygopro.stoc_send(player, 'TEAMMATE_SURRENDER')
        else else
        ygopro.stoc_send_chat(client, "${surrender_confirm}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat(client, "${surrender_confirm}", ygopro.constants.COLORS.BABYBLUE)
        sur_player.surrend_confirm = true sur_player.surrend_confirm = true
        ......
        ygopro-server.js
        View file @ 0b93716f
        ...@@ -4384,7 +4384,7 @@ ...@@ -4384,7 +4384,7 @@
        ref = [client, sur_player]; ref = [client, sur_player];
        for (j = 0, len = ref.length; j < len; j++) { for (j = 0, len = ref.length; j < len; j++) {
        player = ref[j]; player = ref[j];
        ygopro.stoc_send(client, 'TEAMMATE_SURRENDER'); ygopro.stoc_send(player, 'TEAMMATE_SURRENDER');
        } }
        return true; return true;
        } }
        ...@@ -4456,7 +4456,7 @@ ...@@ -4456,7 +4456,7 @@
        ref = [client, sur_player]; ref = [client, sur_player];
        for (j = 0, len = ref.length; j < len; j++) { for (j = 0, len = ref.length; j < len; j++) {
        player = ref[j]; player = ref[j];
        ygopro.stoc_send(client, 'TEAMMATE_SURRENDER'); ygopro.stoc_send(player, 'TEAMMATE_SURRENDER');
        } }
        } else { } else {
        ygopro.stoc_send_chat(client, "${surrender_confirm}", ygopro.constants.COLORS.BABYBLUE); ygopro.stoc_send_chat(client, "${surrender_confirm}", ygopro.constants.COLORS.BABYBLUE);
        ......
        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