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

vuryleo · web-flow · commit c69e836bb3ae · 2026-01-12T08:28:34.000+08:00
diff --git a/operations.cpp b/operations.cpp
@@ -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;
 			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();
 		raise_event(targets->container, EVENT_DESTROY, reason_effect, reason, reason_player, 0, 0);
 		process_instant_event();
@@ -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();
 		pduel->delete_group(targets);
+		adjust_self_destroy_set();
 		return TRUE;
 	}
 	case 10: {

Original file line number	Diff line number	Diff line change
`@@ -3620,7 +3620,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u`
`3620`	`3620`	`core.hint_timing[pcard->current.controler] \|= TIMING_DESTROY;`
`3621`	`3621`	`raise_single_event(pcard, 0, EVENT_DESTROY, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);`
`3622`	`3622`	`}`
`3623`		`- adjust_instant();`
	`3623`	`+ adjust_disable_check_list();`
`3624`	`3624`	`process_single_event();`
`3625`	`3625`	`raise_event(targets->container, EVENT_DESTROY, reason_effect, reason, reason_player, 0, 0);`
`3626`	`3626`	`process_instant_event();`
`@@ -3655,6 +3655,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u`
`3655`	`3655`	`}`
`3656`	`3656`	`returns.ivalue[0] = (int32_t)core.operated_set.size();`
`3657`	`3657`	`pduel->delete_group(targets);`
	`3658`	`+ adjust_self_destroy_set();`
`3658`	`3659`	`return TRUE;`
`3659`	`3660`	`}`
`3660`	`3661`	`case 10: {`