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

libcard.cpp

@@ -1692,6 +1692,8 @@ int32 scriptlib::card_get_hand_synchro(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**)lua_touserdata(L, 1);
+	if(!(pcard->current.location & LOCATION_MZONE))
+		return 0;
 	effect* peffect = pcard->is_affected_by_effect(EFFECT_HAND_SYNCHRO);
 	if(peffect) {
 		interpreter::effect2value(L, peffect);

operations.cpp

@@ -4616,7 +4616,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
 					npos = POS_FACEUP_DEFENSE;
 				pcard->previous.position = opos;
 				pcard->current.position = npos;
-				if(npos & POS_DEFENSE)
+				if((npos & POS_DEFENSE) && !pcard->is_affected_by_effect(EFFECT_DEFENSE_ATTACK))
 					pcard->set_status(STATUS_ATTACK_CANCELED, TRUE);
 				pcard->set_status(STATUS_JUST_POS, TRUE);
 				pduel->write_buffer8(MSG_POS_CHANGE);