Merge remote-tracking branch 'vuryleo/fix-deadloop-self-destroy' into develop

card.cpp

@@ -4068,6 +4068,14 @@ int32_t card::is_can_be_fusion_material(card* fcard, uint32_t summon_type) {
 		if(eset[i]->get_value(fcard, 1))
 			return FALSE;
 	}
+	eset.clear();
+	filter_effect(EFFECT_EXTRA_FUSION_MATERIAL, &eset);
+	if(eset.size()) {
+		for(effect_set::size_type i = 0; i < eset.size(); ++i)
+			if(eset[i]->get_value(fcard))
+				return TRUE;
+		return FALSE;
+	}
 	return TRUE;
 }
 int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {

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: {