Merge branch 'master' of github.com:moecube/ygopro-core into develop

card.cpp

@@ -4214,19 +4214,6 @@ int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {
 	for(effect_set::size_type i = 0; i < eset.size(); ++i)
 		if(eset[i]->get_value(scard))
 			return FALSE;
-	if(scard && !(current.location == LOCATION_MZONE && current.controler == scard->current.controler)) {
-		eset.clear();
-		filter_effect(EFFECT_EXTRA_SYNCHRO_MATERIAL, &eset);
-		if(eset.size()) {
-			for(effect_set::size_type i = 0; i < eset.size(); ++i) {
-				if(!eset[i]->check_count_limit(scard->current.controler))
-					continue;
-				if(eset[i]->get_value(scard))
-					return TRUE;
-			}
-			return FALSE;
-		}
-	}
 	return TRUE;
 }
 int32_t card::is_can_be_ritual_material(card* scard) {

operations.cpp

@@ -45,8 +45,7 @@ int32_t field::disable_chain(uint8_t chaincount, uint8_t forced) {
 	chain& pchain = core.current_chain[chaincount - 1];
 	card* phandler = pchain.triggering_effect->get_handler();
 	if(!(pchain.flag & CHAIN_DISABLE_EFFECT) && is_chain_disablable(pchain.chain_count)
-		&& (!phandler->is_has_relation(pchain) || phandler->is_affect_by_effect(core.reason_effect))
-		&& !(phandler->is_has_relation(pchain) && phandler->is_status(STATUS_DISABLED) && !forced)) {
+		&& (!phandler->is_has_relation(pchain) || phandler->is_affect_by_effect(core.reason_effect))) {
 		core.current_chain[chaincount - 1].flag |= CHAIN_DISABLE_EFFECT;
 		core.current_chain[chaincount - 1].disable_reason = core.reason_effect;
 		core.current_chain[chaincount - 1].disable_player = core.reason_player;