summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-10-20 20:59:34 +0200 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-10-20 20:59:34 +0200 |
commit | 08fab636c981574a703baffad9ebb52ff4308f17 (patch) | |
tree | 6fd3742f4b374fb948ecd017be88e5923dc9d611 /src/battle/query | |
parent | 4aaf3670c0ff4bc46092e909bb450b6336417ed9 (diff) |
...
Diffstat (limited to 'src/battle/query')
-rw-r--r-- | src/battle/query/btl_character_turn.erl | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/battle/query/btl_character_turn.erl b/src/battle/query/btl_character_turn.erl index 9534945..d0046b2 100644 --- a/src/battle/query/btl_character_turn.erl +++ b/src/battle/query/btl_character_turn.erl @@ -263,20 +263,24 @@ handle (Query) -> S0Update = fetch_data(Request), assert_user_permissions(S0Update, Request), - S1Update = btl_actions_management:handle - ( - btl_character_turn_request:get_actions(Request), - S0Update - ), - S2Update = deactivate_character(S1Update), - S3Update = update_timeline(S2Update), - S4Update = btl_turn_progression:handle(S3Update), + S1Update = + btl_character_turn_update:add_actions + ( + true, + btl_character_turn_request:get_actions(Request), + S0Update + ), + + S2Update = btl_actions_management:handle(S1Update), + S3Update = deactivate_character(S2Update), + S4Update = update_timeline(S3Update), + S5Update = btl_turn_progression:handle(S4Update), - commit_update(S4Update, Request), + commit_update(S5Update, Request), shr_security:unlock_queries(PlayerID), - generate_reply(S4Update); + generate_reply(S5Update); error -> jiffy:encode([shr_disconnected:generate()]) end. |