Skip to content

Commit

Permalink
Merge branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Wind2009-Louse committed May 13, 2024
2 parents 670cfc6 + 8b19193 commit c5d7267
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions operations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4646,9 +4646,9 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
target->reset(resetflag, RESET_EVENT);
target->clear_card_target();
}
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
}
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
if(ret == 1)
target->current.reason &= ~REASON_TEMPORARY;
if(ret == 0 && location != target->current.location
Expand Down

0 comments on commit c5d7267

Please sign in to comment.