fix

operations.cpp

@@ -3826,7 +3826,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
 					resetflag |= RESET_LEAVE;
 				effect* peffect = target->is_affected_by_effect(EFFECT_PRE_MONSTER);
 				if((location & LOCATION_ONFIELD) && (target->current.location & LOCATION_ONFIELD)
-					&& !(peffect && (peffect->value & TYPE_TRAP)) && !(target->get_type() & TYPE_TRAPMONSTER))
+					&& !(peffect && (peffect->value & TYPE_TRAP)) && !(ret == 2 && (target->get_type() & TYPE_TRAPMONSTER)))
 					resetflag |= RESET_MSCHANGE;
 				target->reset(resetflag, RESET_EVENT);
 			}

processor.cpp

@@ -5038,10 +5038,10 @@ int32 field::adjust_step(uint16 step) {
 			for(uint8 i = 0; i < 5; ++i) {
 				pcard = player[tp].list_mzone[i];
 				if(!pcard) continue;
-				if((pcard->get_type()&TYPE_TRAPMONSTER) && pcard->is_affected_by_effect(EFFECT_DISABLE_TRAPMONSTER)) {
+				if((pcard->get_type() & TYPE_TRAPMONSTER) && pcard->is_affected_by_effect(EFFECT_DISABLE_TRAPMONSTER)) {
 					pcard->reset(RESET_TURN_SET, RESET_EVENT);
 					refresh_location_info_instant();
-					move_to_field(pcard, tp, tp, LOCATION_SZONE, pcard->current.position);
+					move_to_field(pcard, tp, tp, LOCATION_SZONE, pcard->current.position, FALSE, 2);
 					core.re_adjust = TRUE;
 				}
 			}