Commit a58020c0 authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/master'

parents 157cb45d f8eab488
name: Automated Test Build name: Automated Test Build
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on: on:
push: push:
branches: [ "master" ] branches: [ "master" ]
......
...@@ -4148,6 +4148,7 @@ int32_t field::add_chain(uint16_t step) { ...@@ -4148,6 +4148,7 @@ int32_t field::add_chain(uint16_t step) {
clit.triggering_effect = peffect; clit.triggering_effect = peffect;
clit.evt = ch.evt; clit.evt = ch.evt;
phandler->create_relation(clit); phandler->create_relation(clit);
peffect->set_active_type();
peffect->dec_count(playerid); peffect->dec_count(playerid);
if(!(peffect->type & EFFECT_TYPE_ACTIVATE)) { if(!(peffect->type & EFFECT_TYPE_ACTIVATE)) {
peffect->type |= EFFECT_TYPE_ACTIVATE; peffect->type |= EFFECT_TYPE_ACTIVATE;
......
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