Skip to content

Y
ygopro-core
Commit c69e836b authored by Vury Leo's avatar Vury Leo Committed by GitHub
Browse files
Options

Fix dead-loop on self-destroy by deferring destruction check (#806)

parent 2185e226
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
operations.cpp
View file @ c69e836b
...@@ -3620,7 +3620,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u ...@@ -3620,7 +3620,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u
core.hint_timing[pcard->current.controler] |= TIMING_DESTROY; core.hint_timing[pcard->current.controler] |= TIMING_DESTROY;
raise_single_event(pcard, 0, EVENT_DESTROY, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0); raise_single_event(pcard, 0, EVENT_DESTROY, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
} }
adjust_instant(); adjust_disable_check_list();
process_single_event(); process_single_event();
raise_event(targets->container, EVENT_DESTROY, reason_effect, reason, reason_player, 0, 0); raise_event(targets->container, EVENT_DESTROY, reason_effect, reason, reason_player, 0, 0);
process_instant_event(); process_instant_event();
...@@ -3655,6 +3655,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u ...@@ -3655,6 +3655,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u
} }
returns.ivalue[0] = (int32_t)core.operated_set.size(); returns.ivalue[0] = (int32_t)core.operated_set.size();
pduel->delete_group(targets); pduel->delete_group(targets);
adjust_self_destroy_set();
return TRUE; return TRUE;
} }
case 10: { case 10: {
......
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