Skip to content

Y
ygopro-core
Commit 326801c1 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

fix EFFECT_TO_GRAVE_REDIRECT_CB (#492)

parent 570a29eb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
operations.cpp
View file @ 326801c1
...@@ -4142,6 +4142,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -4142,6 +4142,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
core.sub_solving_event.push_back(e); core.sub_solving_event.push_back(e);
add_process(PROCESSOR_EXECUTE_OPERATION, 0, param->predirect, 0, pcard->current.controler, 0); add_process(PROCESSOR_EXECUTE_OPERATION, 0, param->predirect, 0, pcard->current.controler, 0);
} }
pcard->sendto_param.playerid |= 0x1u << 5;
++param->cvit; ++param->cvit;
core.units.begin()->step = 4; core.units.begin()->step = 4;
return FALSE; return FALSE;
...@@ -4222,7 +4223,8 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -4222,7 +4223,8 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
card_set equipings, overlays; card_set equipings, overlays;
for(auto& pcard : targets->container) { for(auto& pcard : targets->container) {
uint8 nloc = pcard->current.location; uint8 nloc = pcard->current.location;
if(pcard->equiping_target) uint8 cb_redirected = pcard->sendto_param.playerid >> 5;
if(pcard->equiping_target && !cb_redirected)
pcard->unequip(); pcard->unequip();
if(pcard->equiping_cards.size()) { if(pcard->equiping_cards.size()) {
for(auto csit = pcard->equiping_cards.begin(); csit != pcard->equiping_cards.end();) { for(auto csit = pcard->equiping_cards.begin(); csit != pcard->equiping_cards.end();) {
......
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